aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Add missing newline to mpeg1/2 intra matrix error message.Carl Eugen Hoyos2012-02-101-1/+1
| | | |
* | | | Add missing swscale dependency for MP-filters.Carl Eugen Hoyos2012-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Hanspeter Niederstrasser Fixes ticket #989.
* | | | Add missing swresample dependency for ffplay.Hanspeter Niederstrasser2012-02-101-1/+1
| | | | | | | | | | | | | | | | Fixes part of ticket #989.
* | | | sunrast: Remove the useless check.Aneesh Dogra2012-02-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in , else (1) { if (!1) } the if conditional will never evaluate to be true. So as making the check useless. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | ffmpeg: Add threshold to discard crazy/damaged timestamps.Michael Niedermayer2012-02-101-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The added tests are limited to the case where timestamp discontinuities are not allowed. The default is 30 hours which is arbitrarily picked and quite conservative. This prevents a out of memory condition due to duplicating a frame millions of times. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | lavf: Rewrite metadata printing from dump_metadata().Michael Niedermayer2012-02-101-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | This code contained several bugs that mis-formated the output. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1040-128/+145
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation yadif: specify array size outside DECLARE_ALIGNED prores: specify array size outside DECLARE_ALIGNED brackets. WavPack demuxer: set packet duration tta: use skip_bits_long() mxfdec: Ignore the last entry in Avid's index table segments mxfdec: Sanity-check SampleRate mxfdec: Handle small EditUnitByteCount mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index() mxfdec: Sanity check PreviousPartition mxfdec: Never seek back in local sets and KLVs mxfdec: Move the current_partition check inside mxf_read_header() mxfdec: Fix infinite loop in mxf_packet_timestamps() mxfdec: Check eof_reached in mxf_read_local_tags() mxfdec: Check for NULL component mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() mxfdec: Make sure x < index_table->nb_ptses build: Add missing directories to DIRS declarations. ... Conflicts: doc/build_system.txt doc/fate.texi libavfilter/x86/yadif_template.c libavformat/mxfdec.c libavutil/Makefile tests/fate/audio.mak tests/fate/prores.mak tests/fate/screen.mak tests/fate/video.mak tests/ref/fate/bethsoft-vid tests/ref/fate/cscd tests/ref/fate/dfa4 tests/ref/fate/nuv tests/ref/fate/vp8-sign-bias tests/ref/fate/wmv8-drm tests/ref/lavf/gxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | eac3dec: replace undefined 1<<31 with INT32_MIN in noise generationJanne Grunau2012-02-091-1/+1
| | | |
| * | | yadif: specify array size outside DECLARE_ALIGNEDJanne Grunau2012-02-091-4/+4
| | | |
| * | | prores: specify array size outside DECLARE_ALIGNED brackets.Ronald S. Bultje2012-02-091-3/+3
| | | |
| * | | WavPack demuxer: set packet durationPaul B Mahol2012-02-091-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | | tta: use skip_bits_long()Paul B Mahol2012-02-091-7/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | | mxfdec: Ignore the last entry in Avid's index table segmentsTomas Härdin2012-02-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last entry is the total size of the essence container. Previously a TemporalOffset error would be logged, even though segments like these are expected. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Sanity-check SampleRateTomas Härdin2012-02-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | This avoids a SIGFPE if SampleRate is missing or set to naughty values. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Handle small EditUnitByteCountTomas Härdin2012-02-091-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These are common with audio atoms. Without this the demuxer would read two bytes at a time for a mono 16-bit file. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1aTomas Härdin2012-02-091-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | This fixes demuxing of 2011_DCPTEST_24FPS.V.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflowsTomas Härdin2012-02-091-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()Tomas Härdin2012-02-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This fixes SIGSEGV on files with both CBR and VBR index segments (zzuf6.mxf). Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Sanity check PreviousPartitionTomas Härdin2012-02-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Without this certain files could get the demuxer stuck in a loop. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Never seek back in local sets and KLVsTomas Härdin2012-02-091-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specially crafted files can lead the parsing code to take too long. We fix a lot of these problems by not allowing local tags to extend past the end of the set and not allowing other KLVs to be read past the end of themselves. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Move the current_partition check inside mxf_read_header()Tomas Härdin2012-02-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | This fixes SIGSEGV on files where this is the case, such as zzuf4.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Fix infinite loop in mxf_packet_timestamps()Tomas Härdin2012-02-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen if an index table segment has a very large IndexStartPosition. zzuf3.mxf is an example of such a file. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Check eof_reached in mxf_read_local_tags()Tomas Härdin2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes an infinite loop with zzuf2.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Check for NULL componentTomas Härdin2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a SIGSEGV with zzuf1.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()Tomas Härdin2012-02-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a files that lack an index would cause SIGSEGV. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | mxfdec: Make sure x < index_table->nb_ptsesTomas Härdin2012-02-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Avoids a SIGSEGV on files with IndexEntryCount < IndexDuration. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | build: Add missing directories to DIRS declarations.Diego Biurrun2012-02-092-2/+2
| | | |
| * | | arm: Add missing #include to vp8.h to fix a make checkheaders warning.Diego Biurrun2012-02-091-0/+2
| | | |
| * | | swscale: ppc: Add missing header #includes to pass 'make checkheaders'.Diego Biurrun2012-02-091-0/+4
| | | |
| * | | cosmetics: Delete empty lines at end of file.Diego Biurrun2012-02-0927-36/+0
| | | |
| * | | bytestream: K&R formatting cosmeticsAneesh Dogra2012-02-091-53/+68
| | | | | | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | | apetag: fix commentPaul B Mahol2012-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | | rawenc: switch to encode2().Anton Khirnov2012-02-0872-4493/+4504
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes a number of FATE results, since before this commit, the timestamps in all tests using rawenc were made up by lavf. In most cases, the previous timestamps were completely bogus. In some other cases -- raw formats, mostly h264 -- the new timestamps are bogus as well. The only difference is that timestamps invented by the muxer are replaced by timestamps invented by the demuxer. cscd -- avconv sets output codec timebase from r_frame_rate and r_frame_rate is in this case some guessed number 31.42 (377/12), which is not accurate enough to represent all timestamps. This results in some frames having duplicate pts. Therefore, vsync 0 needs to be changed to vsync 2 and avconv drops two frames. A proper fix in the future would be to set output timebase to something saner in avconv. nuv -- previous timestamps for video were wrong AND the cscd comment applies, one frame is dropped. vp8-signbias -- the file contains two frames with identical timestamps, so -vsync 0 needs to be removed/changed to -vsync 2 and avconv drops one frame. vc1-ism -- apparrently either the demuxer lies about timestamps or the file is broken, since dts == pts on all packets, but reordering clearly takes place.
* | | | Fix libstagefright compilationCarl Eugen Hoyos2012-02-091-7/+17
| | | | | | | | | | | | | | | | | | | | Comment-by-michael: iam commiting this as the code cannot work without it and likely works with it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Fix fate tests after 5c2c6bbf.Carl Eugen Hoyos2012-02-095-20/+20
| | | |
* | | | Support encoding BGR24 and BGR0 in ljpeg.Carl Eugen Hoyos2012-02-093-3/+18
| | | |
* | | | Allow encoding rawvideo RGBA64 and friends.Carl Eugen Hoyos2012-02-092-0/+8
| | | |
* | | | Allow encoding rawvideo RGB0 and friends.Carl Eugen Hoyos2012-02-092-0/+8
| | | |
* | | | lavf: put av_new_stream() compatibility wrapper backMichael Niedermayer2012-02-091-0/+10
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | mpeg12dec: print the value that is being ignored in load_matrix()Michael Niedermayer2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | error message by Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | lavf: put av_find_stream_info() compatibility wrapper back.Michael Niedermayer2012-02-091-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | bink: fix pointer type warnings.Michael Niedermayer2012-02-091-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | ffmpeg: better dox for *pts.Michael Niedermayer2012-02-091-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | lavu: add timestamp.h header with convenience timestamp utilitiesStefano Sabatini2012-02-094-2/+82
| | | |
* | | | configure: fix gcc asm tests for MinGW GCC 4.6.2Laurent2012-02-091-1/+2
| | | | | | | | | | | | | | | | | | | | Thanks to stackoverflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-0934-741/+271
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pixdesc: mark pseudopaletted formats with a special flag. avconv: switch to avcodec_encode_video2(). libx264: implement encode2(). libx264: split extradata writing out of encode_nals(). lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket cmdutils: update copyright year to 2012. swscale: sign-extend integer function argument to qword on x86-64. x86inc: support yasm -f win64 flag also. h264: manually save/restore XMM registers for functions using INIT_MMX. x86inc: allow manual use of WIN64_SPILL_XMM. aacdec: Use correct speaker order for 7.1. aacdec: Remove incorrect comment. aacdec: Simplify output configuration. Remove Sun medialib glue code. dsputil: set STRIDE_ALIGN to 16 for x86 also. pngdsp: swap argument inversion. Conflicts: cmdutils.c configure doc/APIchanges ffmpeg.c libavcodec/aacdec.c libavcodec/dsputil.h libavcodec/libx264.c libavcodec/mlib/dsputil_mlib.c libavcodec/utils.c libavfilter/vf_scale.c libavutil/avutil.h libswscale/mlib/yuv2rgb_mlib.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | pixdesc: mark pseudopaletted formats with a special flag.Anton Khirnov2012-02-0811-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to dintinguish them from PAL8. Fixes an invalid write in avpicture_layout().
| * | | avconv: switch to avcodec_encode_video2().Anton Khirnov2012-02-081-35/+16
| | | |
| * | | libx264: implement encode2().Anton Khirnov2012-02-081-18/+29
| | | |
| * | | libx264: split extradata writing out of encode_nals().Anton Khirnov2012-02-081-12/+14
| | | | | | | | | | | | | | | | This is done in preparation for the following patch.