aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | ac3dec: Move center and surround mix level tables to the parser.Michael Niedermayer2012-02-092-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way all mix levels as exported by avpriv_ac3_parse_header() will have the same meaning. Previously the 3-bit center mix level for E-AC-3 was used to index in a 4-entry table, leading to out-of-array reads. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacdec: Unify preconfigured layout and PCE layout.Alex Converse2012-02-091-41/+16
| | |
| * | aacdec: Support native channel layout when requested.Alex Converse2012-02-092-10/+14
| | |
| * | aacdec: Try to sniff a reasonable channel layout for PCE based configurations.Alex Converse2012-02-094-102/+297
| | | | | | | | | | | | This changes the output order of multichannel PCE based streams.
| * | libavcodec: Don't do av_free(av_malloc(0)) for bitstream filtersMartin Storsjö2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | This fixes crashes on exit when closing a bitstream filter that hasn't allocated any private data, on OS X. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Partially revert "Fix png decoding on x86."Reimar Döffinger2012-02-102-10/+10
| | | | | | | | | | | | | | | | | | This partially reverts commit 58dabf7bf2fdd08f79173da0df613127ff783028. It is no longer necessary to use unaligned mov. The swapped mov argument fix remains though.
* | | Fix bitexact intra mismatch control.Reimar Döffinger2012-02-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The DC coefficient should be included, too. This probably was missed because DC quantizer is always even for MPEG-1/2 but this function is also used for MPEG-4. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | mpegvideodec: minor simplifications.Reimar Döffinger2012-02-101-16/+4
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | msmpeg4: replace 999999 by INT_MAX and initial by a valid index.Michael Niedermayer2012-02-101-2/+2
| | | | | | | | | | | | | | | | | | Fixes Ticket990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: prefer NULL over 0 for av_log context pointer parameter.Clément Bœsch2012-02-101-10/+10
| | |
* | | ffmpeg: move quality parameter to do_video_out() scope.Clément Bœsch2012-02-101-11/+6
| | | | | | | | | | | | | | | This make do_video_out() and do_audio_out() consistent. Also simplifies callers.
* | | ffmpeg: make use of ret error out in transcode_video().Clément Bœsch2012-02-101-4/+5
| | |
* | | ffmpeg: move filtered_frame to the CONFIG_AVFILTER scope.Clément Bœsch2012-02-101-6/+5
| | | | | | | | | | | | This simplifies a bit the #ifdefery.
* | | ffmpeg: move do_video_stats() above do_video_out().Clément Bœsch2012-02-101-43/+42
| | | | | | | | | | | | This avoid a forward declaration.
* | | ffmpeg: move video stats code to do_video_out().Clément Bœsch2012-02-101-8/+7
| | | | | | | | | | | | This will allow some simplifications in transcode_video().
* | | ffmpeg: move filtered_frame to video stream processing scope.Clément Bœsch2012-02-101-1/+2
| | |
* | | ffmpeg: reindent after video frame polling simplification.Clément Bœsch2012-02-101-16/+16
| | |
* | | ffmpeg: simplify video frame polling.Clément Bœsch2012-02-101-10/+1
| | | | | | | | | | | | | | | | | | input_video_filter and output_video_filter can't be NULL at this point. If they are, the current code would likely crash anyway (since filtered_frame would be NULL and sent to do_video_out().
* | | ffmpeg: use exit_program() if configure_video_filters() fails.Clément Bœsch2012-02-101-1/+1
| | |
* | | 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>