summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | samplefmt: Fix warning about discarded qualifierjamal2012-07-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | options: Fix warning about incompatible pointer typejamal2012-07-302-3/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-3015-32/+81
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flvdec: remove spurious use of stream id lavf: deprecate r_frame_rate. lavf: round estimated average fps to a "standard" fps. Conflicts: ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/electronicarts.c libavformat/flvdec.c libavformat/rawdec.c libavformat/utils.c tests/ref/fate/iv8-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: remove spurious use of stream idLuca Barbato2012-07-291-8/+7
| | | | | | | | We match streams by codec id now.
| * lavf: deprecate r_frame_rate.Anton Khirnov2012-07-2921-125/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.
| * lavf: round estimated average fps to a "standard" fps.Anton Khirnov2012-07-291-0/+18
| |
* | lavfi/avcodec: rename picref->samplesref variable in ↵Stefano Sabatini2012-07-301-4/+4
| | | | | | | | | | | | avfilter_get_audio_buffer_ref_from_frame() The new name is more meaningful in that context.
* | lavfi/color: free internal context options in uninit()Stefano Sabatini2012-07-301-1/+1
| | | | | | | | | | Keeping the set options in the context when the component is still used can be useful for debugging purposes.
* | lavfi/color: cache and reuse colored picture in contextStefano Sabatini2012-07-301-12/+22
| | | | | | | | | | | | | | Avoid to fill the same picture again and again with the same content. Optimize computation, and provides an example for the use of the AV_PERM_REUSE permission flag.
* | lavfi/color: reindent after the previous commitStefano Sabatini2012-07-301-14/+14
| |
* | lavfi/color: drop support for old deprecated syntaxStefano Sabatini2012-07-303-29/+1
| |
* | lavfi/testsrc: add comment in optionsStefano Sabatini2012-07-301-0/+2
| |
* | Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'Michael Niedermayer2012-07-2915-334/+321
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23': lavf: use dts difference instead of AVPacket.duration in find_stream_info() avf: introduce nobuffer option fate: make yadif tests consistent across systems vf_hqdn3d: support 9 and 10bit colordepth vf_hqdn3d: reduce intermediate precision vf_hqdn3d: simplify and optimize factor identical ff_inplace_start_frame out of two filters vf_hqdn3d: cosmetics avprobe/avconv: fix tentative declaration compile errors on MSVS. Conflicts: doc/APIchanges ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/options_table.h libavformat/utils.c libavformat/version.h tests/fate/filter.mak tests/ref/fate/filter-yadif-mode0 tests/ref/fate/filter-yadif-mode1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use dts difference instead of AVPacket.duration in find_stream_info()Anton Khirnov2012-07-293-8/+42
| | | | | | | | | | | | | | | | | | | | AVPacket.duration is mostly made up and thus completely useless, this is especially true for video streams. Therefore use dts difference for framerate estimation and the max_analyze_duration check. The asyncts test now needs -analyzeduration, because the default is 5 seconds and the audio stream in the sample appears at ~10 seconds.
| * avf: introduce nobuffer optionLuca Barbato2012-07-295-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Useful in cases where a significant analyzeduration is still needed, while minimizing buffering before output. An example is processing low-latency streams where all media types won't necessarily come in if the analyzeduration is small. Additional changes by Josh Allmann <joshua.allmann@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * fate: make yadif tests consistent across systemsMans Rullgard2012-07-283-95/+95
| | | | | | | | | | | | | | | | MMX-enabled systems by default use some dsputil functions differing from the C versions. Adding these flags ensures accurate ones are used everywhere. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vf_hqdn3d: support 9 and 10bit colordepthLoren Merritt2012-07-281-19/+53
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vf_hqdn3d: reduce intermediate precisionLoren Merritt2012-07-281-30/+32
| | | | | | | | | | | | | | 11% faster on penryn, 7% on sandybridge, 5% on bulldozer Negligible change to output. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vf_hqdn3d: simplify and optimizeLoren Merritt2012-07-281-106/+51
| | | | | | | | | | | | 14% faster on penryn, 2% on sandybridge, 9% on bulldozer Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * factor identical ff_inplace_start_frame out of two filtersLoren Merritt2012-07-284-73/+39
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vf_hqdn3d: cosmeticsLoren Merritt2012-07-281-156/+152
| | | | | | | | | | | | Change code style to match the rest of libav. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avprobe/avconv: fix tentative declaration compile errors on MSVS.Ronald S. Bultje2012-07-282-4/+6
| |
* | aacenc: new default cutoffMichael Niedermayer2012-07-293-1/+6
| | | | | | | | | | | | | | Improves subjective quality Formula and testing by: kamedo2 <fujisakihir90@yahoo.co.jp> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: document TB variable for vf_setpts.Nicolas George2012-07-291-0/+3
| |
* | libx264: list possible profiles.Nicolas George2012-07-291-0/+5
| | | | | | | | | | | | | | The values are listed if setting them fails. Using "-profile help" or "-profile list" have that effect. Similar to 3aba391. Suggested by "rogerdpack" in trac ticket #1529.
* | lavf/apetag: move common stuff between writer and reader to single filePaul B Mahol2012-07-293-7/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/general: add missed WavPack muxing support informationPaul B Mahol2012-07-291-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/smacker: remove bogus video from .long_namePaul B Mahol2012-07-291-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | wvenc: support for ape tagsPaul B Mahol2012-07-291-0/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | APE tag writerPaul B Mahol2012-07-293-1/+75
| |
* | WavPack muxerPaul B Mahol2012-07-293-1/+99
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-2940-525/+807
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_idct_10bit: port x86 assembly to cpuflags.Ronald S. Bultje2012-07-281-127/+127
| |
| * x86inc: clip num_args to 7 on x86-32.Loren Merritt2012-07-281-0/+3
| | | | | | | | | | | | | | | | This allows us to unconditionally set the cglobal num_args parameter to a bigger value, thus making writing yasm code even easier than before. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * x86inc: sync to latest version from x264.Ronald S. Bultje2012-07-281-92/+124
| |
| * fft: rename "z" to "zc" to prevent name collision.Ronald S. Bultje2012-07-281-9/+9
| | | | | | | | | | | | Without this, cglobal will expand "z" to "zh" to access the high byte in a register's word, which causes a name collision with the ZH(x) macro further up in this file.
| * wv: return meaningful error codes.Anton Khirnov2012-07-281-22/+23
| |
| * wv: return AVERROR_EOF on EOF, not EIO.Anton Khirnov2012-07-281-1/+1
| |
| * mp3dec: forward errors for av_get_packet().Anton Khirnov2012-07-281-3/+2
| | | | | | | | | | | | | | Don't invent a bogus EIO error. The code now doesn't check for ret == 0, but that check is redundant, av_get_packet() never returns 0.
| * mp3dec: remove a pointless local variable.Anton Khirnov2012-07-281-4/+2
| |
| * mp3dec: remove commented out cruft.Anton Khirnov2012-07-281-1/+0
| |
| * lavfi: bump minor to mark stabilizing the ABI.Anton Khirnov2012-07-281-1/+1
| |
| * FATE: add tests for yadif.Anton Khirnov2012-07-283-0/+104
| |
| * FATE: add a test for delogo video filter.Anton Khirnov2012-07-282-0/+115
| |
| * FATE: add a test for amix audio filter.Anton Khirnov2012-07-281-0/+22
| |
| * audiogen: allow specifying random seed as a commandline parameter.Anton Khirnov2012-07-281-2/+5
| |
| * vc1dec: Override invalid macroblock quantizerMichael Niedermayer2012-07-281-0/+5
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1: avoid reading beyond the last line in vc1_draw_sprites()Michael Niedermayer2012-07-281-2/+6
| | | | | | | | | | | | | | | | Fixes overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1dec: check that coded slice positions and interlacing match.Michael Niedermayer2012-07-281-0/+6
| | | | | | | | | | | | | | | | This fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return valueMichael Niedermayer2012-07-281-4/+10
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
OpenPOWER on IntegriCloud