aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* nutenc: only write an index if there are syncpointsMichael Niedermayer2013-02-181-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ff_gen_search: Fix finding the maximum timestamp in a really small fileMichael Niedermayer2013-02-182-20/+38
| | | | | | | Fixes Assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ff_read_timestamp: check stream_index before using it as array indexMichael Niedermayer2013-02-181-1/+4
| | | | | | | Fixes out of array read Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cdgraphics: set palette to zero tooPaul B Mahol2013-02-181-1/+3
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc/cdxl: clear palette before reading itPaul B Mahol2013-02-181-0/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* x86/dsputil: fix compilation when h263 decoder/encoder are disabled.Ronald S. Bultje2013-02-181-1/+2
| | | | | | | | The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but the h263 loopfilter functions (in the .asm file) are not optimized out (even though their function pointers are never assigned). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264/svq3: stop using draw_edges.Ronald S. Bultje2013-02-183-44/+15
| | | | | | | | | | | Instead, only extend edges on-demand when the motion vector actually crosses the visible decoded area using ff_emulated_edge_mc(). This changes decoding time for cathedral from 8.722sec to 8.706sec, i.e. 0.2% faster overall. More generally (VP8 uses this also), low-motion content gets significant speed improvements, whereas high-motion content tends to decode in approximately the same time. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/showspectrum: add divVerent in the (c) for his recent work on the filter.Clément Bœsch2013-02-181-0/+1
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-180-0/+0
|\ | | | | | | | | | | | | | | | | * qatar/master: svq3: unbreak decoding No change to the code as this fix was already part of FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq3: unbreak decodingMatti Hamalainen2013-02-181-4/+6
| | | | | | | | a7d2861d36756b913e85681b86ed3385274e8ced removed necessary braces.
* | Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'Michael Niedermayer2013-02-182-21/+25
|\| | | | | | | | | | | | | | | | | | | | | * commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b': build: make audio_frame_queue a stand-alone component Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: make audio_frame_queue a stand-alone componentLuca Barbato2013-02-172-17/+23
| | | | | | | | | | Encoders requiring it have the dependency expressed in the configure.
* | Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'Michael Niedermayer2013-02-181-2/+1
|\| | | | | | | | | | | | | | | | | | | * commit '870a0c669e536d56c6325d84f65e34c53792398e': build: The libopencore-amrnb encoder depends on audio_frame_queue Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: The libopencore-amrnb encoder depends on audio_frame_queueDiego Biurrun2013-02-171-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'Michael Niedermayer2013-02-181-2/+2
|\| | | | | | | | | | | | | * commit '8837f4396a1a458a0efb07fe7daba7b847755a7a': libopencore-amrwb: Make AMR-WB ifdeffery more precise Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencore-amrwb: Make AMR-WB ifdeffery more preciseDiego Biurrun2013-02-171-2/+2
| | | | | | | | | | | | | | | | The library might provide an encoder in the future, so it's better to check for the presence of the decoder rather than just the library. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'Michael Niedermayer2013-02-181-1/+5
|\| | | | | | | | | | | | | * commit 'e6bda9a9fd86505927a2e095e495eae104860701': libopencore-amr: Conditionally compile decoder and encoder bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencore-amr: Conditionally compile decoder and encoder bitsDiego Biurrun2013-02-171-1/+5
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'Michael Niedermayer2013-02-181-44/+44
|\| | | | | | | | | | | | | * commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17': libopencore-amrnb: cosmetics: Group all encoder-related code together Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencore-amrnb: cosmetics: Group all encoder-related code togetherDiego Biurrun2013-02-171-44/+44
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7'Michael Niedermayer2013-02-180-0/+0
|\| | | | | | | | | | | | | | | | | * commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7': dsputil: convert remaining op_pixels_func No changes to the code as all these fixes already existed in FFmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: convert remaining op_pixels_funcLuca Barbato2013-02-173-5/+5
| | | | | | | | | | | | Convert to diffptr_t the line_size parameters still int. Remove all the warnings in dsputil.c
* | Merge commit '488f87be873506abb01d67708a67c10a4dd29283'Michael Niedermayer2013-02-183-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '488f87be873506abb01d67708a67c10a4dd29283': roqvideodec: check dimensions validity vqavideo: check chunk sizes before reading chunks qdm2: check array index before use, fix out of array accesses Conflicts: libavcodec/qdm2.c libavcodec/roqvideodec.c libavcodec/vqavideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * roqvideodec: check dimensions validityMichael Niedermayer2013-02-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fee26d352a52eb9f7fcd8d9167fb4a5ba015b612) CC: libav-stable@libav.org Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * vqavideo: check chunk sizes before reading chunksMichael Niedermayer2013-02-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ab6c9332bfa1e20127a16392a0b85a4aa4840889) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 13093f9767b922661132a3c1f4b5ba2c7338b660) CC: libav-stable@libav.org Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * qdm2: check array index before use, fix out of array accessesMichael Niedermayer2013-02-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed) CC: libav-stable@libav.org Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | h264: don't store intra pcm samples in h->mb.Ronald S. Bultje2013-02-185-24/+22
| | | | | | | | | | | | | | | | | | Instead, keep them in the bitstream buffer until we read them verbatim, this saves a memcpy() and a subsequent clearing of the target buffer. decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from 6121.4 to 6095.5 cycles, i.e. 26 cycles faster. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l2: try to fix build on BSDMichael Niedermayer2013-02-181-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/noise: switch to AVLFG noise generatorPaul B Mahol2013-02-171-7/+11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | h264: don't initialize missing pictures when using VDPAU.Carl Eugen Hoyos2013-02-171-1/+2
| | | | | | | | | | | | This fixes an assertion failure when running mplayer -vc ffh264vdpau. Reported by irc user ioni.
* | h264: avoid calling get_format() multiple timesMichael Niedermayer2013-02-171-2/+8
| | | | | | | | | | | | | | | | | | | | Some applications do not like that. Fixes VDA Reduces noise for VDPAU Tested-by: Guillaume POIRIER <poirierg@gmail.com> Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "swfenc: use av_get_audio_frame_duration() instead of ↵Carl Eugen Hoyos2013-02-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | AVCodecContext.frame_size" This reverts commit 620b88a302d522f71a6a95aff500cf7bd8520043. Fixes ticket #2272. Conflicts: libavformat/swfenc.c
* | Add yvu410 as a supported v4l2 input format.Carl Eugen Hoyos2013-02-171-0/+3
| |
* | Add gray16 as a supported v4l2 input format.Carl Eugen Hoyos2013-02-171-0/+1
| |
* | fate: add print() to the tests of evalMichael Niedermayer2013-02-172-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eval: print() supportMichael Niedermayer2013-02-173-2/+20
| | | | | | | | | | | | This allows printing values via av_log from expressions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Only set accelerated arm fft functions if fft is enabled.Carl Eugen Hoyos2013-02-172-0/+4
| | | | | | | | | | | | | | Fixes lavc compilation (linking) for configurations without fft. Reported-by: tyler wear Tested-by: Gavin Kinsey
* | doc/codecs: simple sub_charenc option documentation.Clément Bœsch2013-02-171-0/+3
| |
* | doc/examples: do not allocate AVFrame directly.Nicolas George2013-02-172-9/+19
| | | | | | | | | | | | | | The size of the AVFrame structure is not part of the ABI; it can grow with later versions. Therefore, applications are not supposed to allocate AVFrame directly, they are supposed to use avcodec_alloc_frame() instead.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-171-0/+5
|\| | | | | | | | | | | | | * qatar/master: error_resilience: add required headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: add required headers.Anton Khirnov2013-02-171-0/+5
| |
* | lavf/subtitles: error out in case of bitmap subtitles.Clément Bœsch2013-02-171-0/+7
| |
* | lavc: fix codec_descriptor and pkt_timebase doxy.Clément Bœsch2013-02-171-2/+2
| |
* | tests: fix values for the unsharp testStefano Sabatini2013-02-171-1/+1
| | | | | | | | Set odd size for unsharp matrices, even values are not accepted.
* | lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.Clément Bœsch2013-02-171-10/+10
| |
* | lavfi/subtitles: set a different description between ass and subtitles.Clément Bœsch2013-02-171-2/+2
| |
* | lavfi: rename vf_ass.c to vf_subtitles.cClément Bœsch2013-02-172-2/+2
| |
* | lavfi/subtitles: support charenc option.Clément Bœsch2013-02-172-1/+11
| |
* | lavfi/subtitles: split options between ass and subtitles.Clément Bœsch2013-02-171-8/+14
| |
* | lavc: support subtitles character encoding conversion.Clément Bœsch2013-02-176-5/+131
| |