aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avdevice/v4l2: only use frame period from v4l2 if validMichael Niedermayer2014-02-021-3/+6
| | | | | | | There is evidence that some drivers do not set a valid value See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718805 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* RoQ-encoder: introducing Quake 3 compatibility optionaddr-see-the-website@aetey.se2014-02-012-7/+27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* RoQ decoder: Remove misleading diagnostics.addr-see-the-website@aetey.se2014-02-011-2/+2
| | | | | | | It is not necessarily an error when a chunk does not cover a whole block. Messages did not reflect the actual situation either. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vc1: reset fcm/field_mode in non advanced header parsingMichael Niedermayer2014-02-011-0/+2
| | | | | | | Fixes NULL pointer dereference Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vc1: Check bfraction_lut_indexMichael Niedermayer2014-02-011-1/+7
| | | | | | | | | | Fixes: out of array read Fixes: asan_static-oob_1b40507_2849_SA10143.vc1 Fixes: asan_static-oob_1b40a15_2849_cov_1182297305_SA10143.vc1 Fixes: asan_static-oob_1b40f15_2849_cov_2159513432_SA10143.vc1 Fixes: asan_static-oob_1b40f15_2849_cov_3230311510_SA10143.vc1 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vc1: factor read_bfraction() outMichael Niedermayer2014-02-011-8/+14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vc1dec: Print warning for frame pictures with direct mode MBs, ↵Michael Niedermayer2014-02-011-0/+5
| | | | | | | | | followed by field pictures This case is not implemented No non fuzzed samples are known to use this Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vc1dec: field pictures with direct mode MBs, followed by frame ↵Michael Niedermayer2014-02-011-0/+5
| | | | | | | | | | | pictures are not supported This case could occur when cuting and concatenating bitstreams Fixes out of array read Fixes: asan_heap-oob_1b33fdd_2849_cov_478905890_SA10143.vc1 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-01-311-0/+1
|\ | | | | | | | | | | | | * cehoyos/master: Auto-detect hevc in mpeg-ts. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Auto-detect hevc in mpeg-ts.Ståle Kristoffersen2014-01-311-0/+1
| | | | | | | | | | | | Fixes decoding of files without PMT/PAT. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | avcodec/mjpegdec: use the correct linesize in the flipping codeMichael Niedermayer2014-01-311-3/+3
| | | | | | | | | | | | | | | | | | | | Fixes out of array access No releases should be affected Depends on 7c3700cd1d8683966b21fffbf02e326d0bd14e06, do not backport without this one Fixes: asan_heap-oob_14a37fe_9111_cov_1692584941_test4.amv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/takdec: always check bits_per_raw_sampleMichael Niedermayer2014-01-311-5/+3
|/ | | | | | | Fixes out of array access Fixes: asan_heap-oob_19c7a94_6470_cov_1453611734_luckynight-partial.tak Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxpeg_decode_end: zero bitmask sizeMichael Niedermayer2014-01-311-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask sizeMichael Niedermayer2014-01-314-8/+15
| | | | | | | Fixes: heap array overread Fixes: asan_heap-oob_149b2bc_6577_m1.mxg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/flac_picture: clear padding areaMichael Niedermayer2014-01-311-0/+1
| | | | | | | | aviod use of uninitialized memory Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/flac_picture: allocate buffer padding for pictureMichael Niedermayer2014-01-311-1/+1
| | | | | | | Fixes: heap array overread Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-313-0/+32
|\ | | | | | | | | | | | | * qatar/master: fate: add xvid test for custom matrices Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add xvid test for custom matricesJanne Grunau2014-01-313-0/+28
| | | | | | | | Test sample is made from the sample in Bug-Id: videolan/7411
* | Merge commit '7716dd9fbbcea2700a100c995df967d5547c2eb9'Michael Niedermayer2014-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7716dd9fbbcea2700a100c995df967d5547c2eb9': xvid: switch to xvid mmx idct as soon as possible Conflicts: libavcodec/mpeg4videodec.c Not merged, as the bug was not merged either See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f, and related commits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xvid: switch to xvid mmx idct as soon as possibleJanne Grunau2014-01-311-29/+29
| | | | | | | | | | | | | | The idct implementation cannot be changed after the quantization matrices are read since it use a different permutaion. Bug-Id: videolan/7411
* | Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'Michael Niedermayer2014-01-311-1/+1
|\| | | | | | | | | | | | | * commit '78987a88a88b28d93d03ed6c228bcb33f178444f': lavf: include 60 fps in guessed standard frame rates Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: include 60 fps in guessed standard frame ratesJanne Grunau2014-01-311-2/+2
| | | | | | | | | | Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001 is not tested as standard frame rate in avformat_find_stream_info().
* | Merge commit '5312818524484a995433b986a2a7a6602572d4db'Michael Niedermayer2014-01-311-10/+18
|\| | | | | | | | | | | | | * commit '5312818524484a995433b986a2a7a6602572d4db': atrac3plus: Make initialization dependant on channel count rather than channel map Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3plus: Make initialization dependant on channel count rather than ↵Jan Ekström2014-01-311-10/+18
| | | | | | | | | | | | | | | | channel map Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding, which is needed in multimedia frameworks, as well as in general cases where demuxing and decoding are separate entities.
* | Merge commit '9ee9c679a7d444db223cf932e89cd39351f54f2d'Michael Niedermayer2014-01-310-0/+0
|\| | | | | | | | | | | | | | | * commit '9ee9c679a7d444db223cf932e89cd39351f54f2d': x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'. See: cd86eb265f36a79d2996f44ba7ec7e7acbc99f81 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.Ronald S. Bultje2014-01-301-1/+1
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'Michael Niedermayer2014-01-311-1/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2': x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such. Conflicts: libavcodec/x86/videodsp_init.c See: 1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.Ronald S. Bultje2014-01-302-39/+70
| | | | | | | | | | | | | | | | Should fix crashes or corrupt output on pre-SSE2 CPUs when they were using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in hfix or hvar single-edge (left/right) extension functions. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returnsMichael Niedermayer2014-01-311-0/+5
| | | | | | | | | | Fixed CID1135755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: check mkdir() return codeMichael Niedermayer2014-01-311-1/+8
| | | | | | | | | | | | | | | | | | This also returns failure if the mkdir failure is not due to an already existing path. Fixed CID1135749 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print data size too in statisticMichael Niedermayer2014-01-311-1/+2
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/APIchanges: apply minor formatting fixesStefano Sabatini2014-01-311-5/+5
| |
* | Changelog: add entries relating to metadata_header_paddingJames Darnley2014-01-302-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: also count data streams bytesMichael Niedermayer2014-01-301-2/+5
| | | | | | | | | | | | Fixes wrong error message about empty output file Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}().Clément Bœsch2014-01-302-42/+53
| | | | | | | | | | 5.40s → 5.30s overall decode time with -threads 1 on ped1080p.webm (i7 920, ssse3)
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-301-1/+1
|\| | | | | | | | | | | | | | | | | | | * qatar/master: doc: document correct option to list encoders Conflicts: doc/encoders.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: document correct option to list encodersJohn Stebbins2014-01-291-1/+1
| |
* | Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'Michael Niedermayer2014-01-301-1/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7': doc: add decoders.texi Conflicts: doc/decoders.texi doc/ffmpeg.texi doc/ffplay.texi See: 5e45f03420945dfeaf66729f5d022e5c15ff5723 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: add decoders.texiJohn Stebbins2014-01-293-0/+58
| | | | | | | | Only documents ac3 decoder options at this point.
* | Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'Michael Niedermayer2014-01-301-3/+8
|\| | | | | | | | | | | | | | | | | | | * commit '23d461fe8714a20ee5e6929f22c61512fdda568e': ac3dec: Allow asymmetric application of DRC when drc_scale > 1 Conflicts: libavcodec/ac3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3dec: Allow asymmetric application of DRC when drc_scale > 1John Stebbins2014-01-291-3/+8
| | | | | | | | | | Amplification of quiet sounds is enhanced. Inspired by gbooker's A52Decoder.
* | Add rangecoder to the sonic dependencies in configure.Carl Eugen Hoyos2014-01-301-2/+2
| | | | | | | | | | Fixes compilation with --disable-everything --enable-decoder=sonic and --disable-everything --enable-encoder=sonic.
* | Warn the user if mjpeg cbr encoding with frame threading was requested.Carl Eugen Hoyos2014-01-301-0/+6
| |
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-01-301-0/+8
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Force automatic thread_count to 1 for cbr mjpeg frame threading. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Force automatic thread_count to 1 for cbr mjpeg frame threading.Carl Eugen Hoyos2014-01-301-0/+8
| | | | | | | | | | | | Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.
* | | avcodec/mjpegdec: use av_freep() instead of av_free()Michael Niedermayer2014-01-301-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of ↵Michael Niedermayer2014-01-301-0/+1
| | | | | | | | | | | | | | | | | | decoding failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mjpegdec: parse JPS extension and save relevant stereo3d informationKirill Gavrilov2014-01-302-0/+52
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-291-31/+23
|\| | | | | | | | | | | | | * qatar/master: avformat: utils: Refactor duplicated PRINT macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: utils: Refactor duplicated PRINT macroDiego Biurrun2014-01-291-31/+23
| |