summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-2121-23/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-2128-33/+34
| |
* | Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'Michael Niedermayer2012-12-2140-939/+1271
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6906b19346ae8a330bfaa1c16ce535be10789723': lavc: add missing files for arm lavc: introduce VideoDSPContext Conflicts: configure libavcodec/arm/dsputil_init_armv5te.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add missing files for armLuca Barbato2012-12-202-0/+59
| | | | | | | | Across the many retouches those did not make the main commit.
| * lavc: introduce VideoDSPContextRonald S. Bultje2012-12-2036-923/+1183
| | | | | | | | | | | | | | | | Move some functions from dsputil. The idea is that videodsp contains functions that are useful for a large and varied set of video decoders. Currently, it contains emulated_edge_mc() and prefetch(). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | alsdec: cosmetics after previous commitPaul B Mahol2012-12-211-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | alsdec: channel sortingPaul B Mahol2012-12-211-3/+13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | gifdec: remove dead storePaul B Mahol2012-12-211-1/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Always write all colours for animated gif files, including transparent ones.Carl Eugen Hoyos2012-12-201-2/+3
| | | | | | | | | | | | This fixes the colour of the transparent background (as seen with ffplay), and makes the background of some non-keyframes transparent that was incorrectly shown as opaque for some samples.
* | gifdec: fix invalid write in gif_copy_img_rectPaul B Mahol2012-12-201-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | gifdec: fix invalid write in giff_fill_rectPaul B Mahol2012-12-201-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tiffdec: support LZW compression with inverted FillOrderPiotr Bandurski2012-12-201-0/+14
| |
* | h264: Fix code to also handle pix format changes.Michael Niedermayer2012-12-201-4/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-202-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: add option for dithering during sample format conversion to s16 mpeg12: do not decode extradata more than once. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: do not decode extradata more than once.Anton Khirnov2012-12-192-1/+3
| | | | | | | | | | | | Fixes CVE-2012-2803. CC: libav-stable@libav.org
* | Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-201-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011': cmdutils: pass number of groups to split_commandline(). mov: handle h263 and flv1 for codec_tag 'H','2','6','3' h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles Conflicts: libavcodec/h264_ps.c libavformat/isom.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profilesVictor Lopez2012-12-191-1/+5
| | | | | | | | | | | | Fixes bug 396. CC: libav-stable@libav.org
* | h264: remove unused variableMichael Niedermayer2012-12-201-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: increase scratchpad sizesMichael Niedermayer2012-12-201-1/+1
| | | | | | | | | | | | | | These where reduced in f1d8763a02b5fce9a7d9789e049d74a45b15e1e8 and this change can cause out of array accesses. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-201-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: increase edge_emu_buffer size for VC1 lavc: merge latest x86inc.asm fixes with x264 Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: increase edge_emu_buffer size for VC1Janne Grunau2012-12-191-1/+3
| | | | | | | | | | | | | | | | | | The VC1 decoder uses edge_emu_buffer simultaneously for luma and chroma and needs more space. That was not a problem before f1d8763a02b5fce since the size for edge_emu_buffer was always calculated with 2 byte per pixel since the linesize was not known. Fixes occasionally fate errors in vc1_sa10143.
* | Merge commit 'acb571c89a065d943163c11efb46de35774f1909'Michael Niedermayer2012-12-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'acb571c89a065d943163c11efb46de35774f1909': avcodec: bump minor for adaptive h264 frame-mt avconv: pass the actually selected decoder to filter_codec_opts(). Conflicts: Changelog ffmpeg_opt.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: bump minor for adaptive h264 frame-mtJanne Grunau2012-12-181-2/+2
| | | | | | | | Also adds forgotten Changelog entry.
| * h264: support frame parameter changes during frame-mtJanne Grunau2012-12-182-127/+230
| | | | | | | | Fixes CVE-2012-2782.
* | h264: use must_reinit to simplify codeMichael Niedermayer2012-12-191-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: decode_update_thread_context() copy parameter sets before using themMichael Niedermayer2012-12-191-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: remove reschange blockingMichael Niedermayer2012-12-191-5/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: support frame size changes with multi threadingMichael Niedermayer2012-12-192-86/+175
| | | | | | | | | | | | Based on code by Janne Grunau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move h264_set_parameter_from_sps() call upMichael Niedermayer2012-12-191-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move list_count and current_slice reset to flush_change()Michael Niedermayer2012-12-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: split flush_change() out of flush_dpb()Michael Niedermayer2012-12-191-8/+21
| | | | | | | | | | Based on a patch by Janne Grunau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: factor get_pixel_format() outMichael Niedermayer2012-12-191-72/+82
| | | | | | | | | | | | Based on patch by Janne Grunau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'Michael Niedermayer2012-12-198-25/+98
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8': mpegvideo: allocate scratch buffers after linesize is known Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: allocate scratch buffers after linesize is knownJanne Grunau2012-12-185-22/+85
| | | | | | | | | | | | | | | | | | | | | | Since we can't know which stride a custom get_buffer() implementation is going to use we have to allocate this scratch buffers after the linesize is known. It was pretty safe for 8 bit per pixel pixel formats since we always allocated memory for up to 16 bits per pixel. It broke hoever with cmdutis.c's alloc_buffer() and high pixel bit depth since it allocated larger edges than mpegvideo expected. Fixes fuzzed sample nasa-8s2.ts_s244342.
* | Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'Michael Niedermayer2012-12-192-8/+11
|\ \ | |/ | | | | | | | | | | | | * commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937': ff_h264_direct_ref_list_init: fix B slice check. h264: increase dist_scale_factor for up to 32 references Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ff_h264_direct_ref_list_init: fix B slice check.Michael Niedermayer2012-12-181-1/+1
| | | | | | | | | | | | Fixes null pointer dereference. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * h264: increase dist_scale_factor for up to 32 referencesJanne Grunau2012-12-182-8/+11
| | | | | | | | | | Compute dist_scale_factor_field only for MBAFF since that is the only case in which it is used.
* | Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'Michael Niedermayer2012-12-193-54/+54
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * misc typo, style and wording fixesDiego Biurrun2012-12-183-55/+55
| |
* | Show underscores in av_get_codec_tag_string().Carl Eugen Hoyos2012-12-191-1/+1
| |
* | qcelpdata: correct start bit for cbgain[0] in qcelp_rate_octave_bitmap[]Paul B Mahol2012-12-191-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-181-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: configure: formatting cosmetics h264: use mbaff ref indices in fill_colmap() only for mbaff references Conflicts: libavcodec/h264_direct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: use mbaff ref indices in fill_colmap() only for mbaff referencesMichael Niedermayer2012-12-181-1/+2
| | | | | | | | | | | | Prevents writing beyond array bounds. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | h264: remove redundant parts of old slice in extradata code.Michael Niedermayer2012-12-182-11/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: merge old and new "slice in extradata" checksMichael Niedermayer2012-12-181-14/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'Michael Niedermayer2012-12-182-7/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29': h264: prevent decoding of slice NALs in extradata doxy: Clarify what avpriv_set_pts_info does Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: prevent decoding of slice NALs in extradataJanne Grunau2012-12-182-7/+23
| | | | | | | | | | | | | | | | It is not posible to call get_buffer during frame-mt codec initialization. Libavformat might pass huge amounts of data as extradata after parsing broken files. The 'extradata' for the fuzzed sample sample_varPAR_s5374_r001-02.avi is 2.8M large and contains multiple slices.
* | Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'Michael Niedermayer2012-12-182-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a': au: Reorder code so that both muxer and demuxer are under #ifdefs fate: Move RALF test into lossless audio group cosmetics: Use consistent names for multiple inclusion guards. Conflicts: libavformat/au.c tests/fate/lossless-audio.mak tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Use consistent names for multiple inclusion guards.Diego Biurrun2012-12-172-6/+6
| |
| * h264: fix memleak on error during SPS parsingJanne Grunau2012-12-151-1/+1
| | | | | | | | Introduced in d7d6efe42b0d.
OpenPOWER on IntegriCloud