aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | x11grab: fix compilationMichael Niedermayer2012-03-181-1/+1
| | | | | | | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | pthread: Fix mixing of declarations and statements.Michael Niedermayer2012-03-171-1/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-1717-276/+260
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: resample: allocate a large enough output buffer fate: fix enc_dec_pcm tests with remote target wmaenc: remove bit-exact hack FATE: remove WMA acodec tests FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison qtrle: Use bytestream2 functions to prevent buffer overreads. vqavideo: check malloc return values x11grab: fix a memory leak exposed by valgrind threads: fix old frames returned after avcodec_flush_buffers() MPV: always mark dummy frames as reference h264: fix deadlocks on incomplete reference frame decoding. mpeg4: report frame decoding completion at ff_MPV_frame_end(). mimic: don't use self as reference, and report completion at end of decode(). Conflicts: libavcodec/h264.c libavcodec/qtrle.c libavcodec/resample.c libavcodec/vqavideo.c libavdevice/x11grab.c tests/ref/seek/wmav1_asf tests/ref/seek/wmav2_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | resample: allocate a large enough output bufferJustin Ruggles2012-03-171-2/+4
| | | | | | | | | | | | | | | Fixes invalid writes and crashes when doing conversions such as stereo to 5.1 channels or sample rate conversion on 5.1 channels.
| * | fate: fix enc_dec_pcm tests with remote targetMans Rullgard2012-03-171-2/+2
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * | wmaenc: remove bit-exact hackJustin Ruggles2012-03-171-4/+0
| | | | | | | | | | | | | | | | | | It may have improved cross-platform stability, but wasn't the only place in the encoder with bitexact issues. It is no longer needed because we have FATE tests for float encoders using fuzzy comparison.
| * | FATE: remove WMA acodec testsJustin Ruggles2012-03-175-125/+0
| | |
| * | FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparisonJustin Ruggles2012-03-171-0/+19
| | |
| * | FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparisonJustin Ruggles2012-03-171-0/+16
| | |
| * | qtrle: Use bytestream2 functions to prevent buffer overreads.Aneesh Dogra2012-03-161-113/+74
| | | | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | vqavideo: check malloc return valuesPaul B Mahol2012-03-161-8/+19
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | x11grab: fix a memory leak exposed by valgrindAntonio Ospite2012-03-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using "-f x11grab -i :0.0" valgrind reports a definitely lost memory block with this message: ==31544== 5 bytes in 1 blocks are definitely lost in loss record 1 of 2 ==31544== at 0x4026E68: memalign (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==31544== by 0x4026F17: posix_memalign (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==31544== by 0x60D399A: av_malloc (in /usr/lib/x86_64-linux-gnu/libavutil.so.51.22.1) ==31544== by 0x60D3A70: av_strdup (in /usr/lib/x86_64-linux-gnu/libavutil.so.51.22.1) ==31544== by 0x4A2BE58: ??? (in /usr/lib/x86_64-linux-gnu/libavdevice.so.53.2.0) ==31544== by 0x506D29E: avformat_open_input (in /usr/lib/x86_64-linux-gnu/libavformat.so.53.21.0) ==31544== by 0x400A80: main (in /home/ao2/WIP/am7xxx-play/tests/a.out) The 5 bytes lost are the ones from param = av_strdup(":0.0"), so let's free param in the exit path. Also check the av_strdup() return value. Note: calling av_free(param) even when av_strdup() fails and param is NULL is OK and keeps the code simpler without adding another label to skip av_free(). Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | threads: fix old frames returned after avcodec_flush_buffers()Uoti Urpala2012-03-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling avcodec_flush_buffers() and then avcodec_decode_video2() with a 0-sized packet (to get remaining buffered frames) could incorrectly return an old frame from before the avcodec_flush_buffers() call. Add a loop in ff_thread_flush() to zero the got_frame field of each thread to ensure the old frames will not be returned. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | MPV: always mark dummy frames as referenceJanne Grunau2012-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | If the dummy frame are not created from a reference frame they could be deleted untimely resulting in multithreaded decoder waiting on the current frame to finish. Noticed by Ronald S. Bultje in the RV34 decoder with a broken file.
| * | h264: fix deadlocks on incomplete reference frame decoding.Ronald S. Bultje2012-03-161-18/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If decoding a second complementary field, and the first was decoded in our thread, mark decoding of that field as complete. If decoding fails, mark the decoded field/frame as complete. Do not allow switching between field modes or field/frame mode between slices within the same field/frame. Ensure that two subsequent fields cover top/bottom (rather than top/frame, bottom/frame or such nonsense situations). Fixes various deadlocks when decoding samples with errors in reference frames. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | mpeg4: report frame decoding completion at ff_MPV_frame_end().Ronald S. Bultje2012-03-161-2/+1
| | | | | | | | | | | | | | | | | | | | | Prevents hangs on corrupt input. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | mimic: don't use self as reference, and report completion at end of decode().Ronald S. Bultje2012-03-161-6/+7
| | | | | | | | | | | | | | | | | | | | | Fixes hangs on corrupt samples that reference self-frames. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | | dsp: fix diff_bytes_mmx() with small widthMichael Niedermayer2012-03-171-0/+1
| | | | | | | | | | | | | | | | | | Fixes Ticket1068 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | vf_thumbnail: forward request_frame at least once.Nicolas George2012-03-171-2/+2
| | | | | | | | | | | | | | | | | | The current version relied on poll_frame to request the very first frame, that would not work if the surrounding code does not call poll_frame.
* | | udp: fix non-blocking and interrupt handling.Nicolas George2012-03-171-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In non-blocking mode, lowest-level read protocols are supposed block only for a short amount of time to let retry_transfer_wrapper() check for interrupts. Also, checking the interrupt_callback in the receiving thread is wrong, as interrupt_callback is not guaranteed to be thread-safe and the job is already done by retry_transfer_wrapper(). The error code was also incorrect. Bug reported by Andrey Utkin.
* | | lavfi/crop: show input and output sample aspect ratio in the logStefano Sabatini2012-03-171-2/+3
| | |
* | | url: document url_read exact behaviour.Nicolas George2012-03-171-0/+13
| | |
* | | lavfi/allfilters: fix weird vertical alignStefano Sabatini2012-03-171-1/+1
| | |
* | | lavfi: add bbox filterStefano Sabatini2012-03-178-2/+247
| | | | | | | | | | | | | | | | | | Also add bbox.h and bbox.c files, based on the remove-logo filter by Robert Edele. These files are useful for sharing code with the pending removelogo port.
* | | pcm: leave sample format conversion to libswresamplePaul B Mahol2012-03-171-20/+17
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-174-2094/+2456
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: K&R formatting cosmetics s3tc.h: Add missing #include to fix standalone header compilation. FATE: add capability for audio encode/decode tests with fuzzy psnr comparison FATE: allow a tolerance in the size comparison in do_tiny_psnr() FATE: use absolute difference from a target value in do_tiny_psnr() FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | h264: K&R formatting cosmeticsDiego Biurrun2012-03-161-2106/+2448
| | | | | | | | | | | | Also remove some disabled code and fix a few comment typos.
| * | s3tc.h: Add missing #include to fix standalone header compilation.Diego Biurrun2012-03-161-0/+2
| | |
| * | FATE: add capability for audio encode/decode tests with fuzzy psnr comparisonJustin Ruggles2012-03-151-0/+10
| | | | | | | | | | | | | | | | | | This allows for testing floating-point audio encoders across different platforms where exact comparisons are unreliable due to float rounding differences.
| * | FATE: allow a tolerance in the size comparison in do_tiny_psnr()Justin Ruggles2012-03-152-2/+4
| | | | | | | | | | | | | | | This will allow for comparing decoded output to the original source when the decoded size is not exactly the same as the original size.
| * | FATE: use absolute difference from a target value in do_tiny_psnr()Justin Ruggles2012-03-152-5/+13
| | | | | | | | | | | | | | | This will allow comparison to original pre-encoded content instead of comparing to expected decoded output.
| * | FATE: allow tests to set CMP_SHIFT to pass to tiny_psnrJustin Ruggles2012-03-152-2/+3
| | | | | | | | | | | | | | | This will allow adjusting for any encoder or decoder delay when doing comparisons.
| * | FATE: use $fuzz directly in do_tiny_psnr() instead of passing it aroundJustin Ruggles2012-03-151-6/+6
| | |
* | | ffmpeg: allow selective and complete disabling of map_metadata.Michael Niedermayer2012-03-171-3/+11
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mpegvideo: don't pretend the first frame is always a key frameWolfram Gloger2012-03-163-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfram Gloger <wmglo@dent.med.uni-muenchen.de> Modify the parser initialization so that parsers can set pict_type themselves. Use this in the mpegvideo parser so that initial frames are not unconditionally I frames. I have had this in my tree for several years. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | sonic: update to new APIMichael Niedermayer2012-03-161-4/+17
| | | | | | | | | | | | | | | | | | Fixes Ticket1075 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | matroskadec: Fix null pointer exception on corrupted input.Michael Niedermayer2012-03-161-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ass: fix DAR calculation.Michael Niedermayer2012-03-161-1/+1
| | | | | | | | | | | | | | | Found-by: REN Lifeng <renlifeng@wowfly.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-165-136/+143
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dxa: remove useless code lavf: don't select an attached picture as default stream for seeking. avconv: remove pointless checks. avconv: check for get_filtered_frame() failure. avconv: remove a pointless check. swscale: convert hscale() to use named arguments. x86inc: add *mp named argument support to DEFINE_ARGS. swscale: convert hscale to cpuflags(). Conflicts: ffmpeg.c libswscale/x86/scale.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | dxa: remove useless codePaul B Mahol2012-03-151-2/+0
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | lavf: don't select an attached picture as default stream for seeking.Anton Khirnov2012-03-151-1/+2
| | |
| * | avconv: remove pointless checks.Anton Khirnov2012-03-151-5/+3
| | | | | | | | | | | | | | | OutputStream.picref is guaranteed to be non-NULL if get_filtered_video_frame() succeeds.
| * | avconv: check for get_filtered_frame() failure.Anton Khirnov2012-03-151-3/+7
| | |
| * | avconv: remove a pointless check.Anton Khirnov2012-03-151-2/+1
| | | | | | | | | | | | | | | output_video_filter is always guaranteed to be set and is in fact dereferenced right above the check.
| * | swscale: convert hscale() to use named arguments.Ronald S. Bultje2012-03-141-94/+98
| | |
| * | x86inc: add *mp named argument support to DEFINE_ARGS.Ronald S. Bultje2012-03-141-0/+2
| | |
| * | swscale: convert hscale to cpuflags().Ronald S. Bultje2012-03-141-35/+37
| | |
* | | huffyuv: some more constsMichael Niedermayer2012-03-151-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | dsputil: mark source of diff_bytes as const.Michael Niedermayer2012-03-153-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | dirac: mark some variables const.Michael Niedermayer2012-03-153-7/+7
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>