summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* lavf/segment: add support to ffconcat segment listStefano Sabatini2013-03-07
|
* doc/texi2pod: fix @ref substitution rule, disallow "}" within the fieldsStefano Sabatini2013-03-07
| | | | Fix potential spurious substitution.
* lavu: add escape APIStefano Sabatini2013-03-07
| | | | | | | | The escape API will be useful to perform escaping programmatically, which is required when crafting argument strings, and will be used for context printing as well. This is based on the ffescape tool code, with a few extensions and fixes.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-07
|\ | | | | | | | | | | | | * qatar/master: avconv: Make sure the encoder exists before inspecting supported_list Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Make sure the encoder exists before inspecting supported_listMartin Storsjö2013-03-06
| | | | | | | | | | | | | | This fixes crashes when there is no encoder for the default codec of selected format. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'Michael Niedermayer2013-03-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5da51284937649a8ebb84fa951c235438fcbf8ae': cavs: Add a dependency on h264chroma lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs Conflicts: libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cavs: Add a dependency on h264chromaCarl Eugen Hoyos2013-03-06
| | | | | | | | | | | | This fixes standalone building of this decoder. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecsRonald S. Bultje2013-03-06
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'Michael Niedermayer2013-03-07
|\| | | | | | | | | | | | | | | * commit '5a4e9fe855282a99586050a507d0a486ad39df5b': avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch shorten: use the unsigned type where needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatchDiego Biurrun2013-03-06
| |
| * shorten: use the unsigned type where neededLuca Barbato2013-03-06
| | | | | | | | | | | | get_uint returns an unsigned value, use an unsigned to store blocksize to make sure the comparison logic is correct and report correctly the error for the channel count not supported.
* | Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'Michael Niedermayer2013-03-06
|\| | | | | | | | | | | | | | | | | | | * commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a': shorten: report meaningful errors Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: report meaningful errorsLuca Barbato2013-03-06
| |
* | Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'Michael Niedermayer2013-03-06
|\| | | | | | | | | | | | | | | | | | | * commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca': shorten: K&R formatting cosmetics Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: K&R formatting cosmeticsLuca Barbato2013-03-06
| |
* | Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'Michael Niedermayer2013-03-06
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5': shorten: set invalid channels count to 0 vorbisdec: check memory allocations h264: check for luma and chroma bit dept being equal Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: set invalid channels count to 0Michael Niedermayer2013-03-06
| | | | | | | | | | | | | | | | Prevent the loop shorten_decode_close from writing and freeing out of the array boundary. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * vorbisdec: check memory allocationsLuca Barbato2013-03-06
| |
| * h264: check for luma and chroma bit dept being equalLuca Barbato2013-03-05
| | | | | | | | | | | | | | | | | | | | The decoder assumes a single bit depth for all the planes while the specification allows different bit depths for luma and chroma. Avoid the possible problems described in CVE-2013-2277 CC: libav-stable@libav.org
* | normalize calls to ff_alloc_packet2James Zern2013-03-06
| | | | | | | | | | | | | | - check ret < 0 - remove excessive error log Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables.Ronald S. Bultje2013-03-06
| | | | | | | | | | | | These are widely used throughout libavcodec, nothing dsputil-specific. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | snowenc: fix indentionMichael Niedermayer2013-03-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | snowenc: add forgotten emms_c()Michael Niedermayer2013-03-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/concat: document the use of the files durations.Nicolas George2013-03-06
| | | | | | | | Address trac ticket #2319.
* | snowenc: initialize edgesMichael Niedermayer2013-03-06
| | | | | | | | | | | | | | This fixes a regression caused by changes to the buffer initialization code. Fixes valgrind warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: use av_log_ask_for_sample for odd spritesMichael Niedermayer2013-03-06
| | | | | | | | | | Suggested-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libilbc: use ff_alloc_packet2Paul B Mahol2013-03-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | libopusenc: use ff_alloc_packet2James Zern2013-03-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-06
|\| | | | | | | | | | | | | | | | | | | * qatar/master: hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice Conflicts: libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: consistent name prefixes for start_frame/end_frame/decode_sliceDiego Biurrun2013-03-05
| | | | | | | | | | Some hwaccels use name prefixes, some do not, others only use them for some codecs. Add prefixes everywhere for consistency.
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-03-06
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Move the iconv test to the bottom of configure. Make 32bit zmbv colour-space opaque. Use uint8_t instead of uint16_t pointer in kega decoder. kgv1dec: Simplify kega decoding by using memcpy instead of loops Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Move the iconv test to the bottom of configure.Carl Eugen Hoyos2013-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a possible mis-detection of iconv on OS X. OS X with macports often has two version of libiconv.2.dylib installed, one with symbols like "_iconv_open" and one with "_libiconv_open", so test for iconv with all flags to make sure the detection uses the same library as the actual compilation / linking. Tested-by: Paul Sturbaum
| * | Make 32bit zmbv colour-space opaque.Carl Eugen Hoyos2013-03-06
| | |
| * | Use uint8_t instead of uint16_t pointer in kega decoder.Carl Eugen Hoyos2013-03-06
| | | | | | | | | | | | | | | This change allows to remove a few casts and avoids a potential pointer aliasing violation.
| * | kgv1dec: Simplify kega decoding by using memcpy instead of loopsReimar Döffinger2013-03-06
| | | | | | | | | | | | | | | | | | Fixes decoding errors with icc 13.1 Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | | qdm2: check "AC" codewordsMichael Niedermayer2013-03-06
| | | | | | | | | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | qdm2: simplify arithmetic coder tables generationMichael Niedermayer2013-03-06
| | | | | | | | | | | | | | | | | | Someone should rename the variables, theres nothing random in there Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | rv20: Fix handling of frame skip.Michael Niedermayer2013-03-06
| | | | | | | | | | | | | | | | | | | | | Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mss2dsp/upsample_plane: fix 0x0 handlingMichael Niedermayer2013-03-06
| | | | | | | | | | | | | | | | | | | | | Fixes invalid memcpy and out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | vc1dec: odd sized sprites are unsupportedMichael Niedermayer2013-03-06
|/ / | | | | | | | | | | | | | | | | | | It should be easy to add support but without a sample we would not know if they work. Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: dont truncate type 2-5 valuesMichael Niedermayer2013-03-05
| | | | | | | | | | | | | | Fixes use of uninitialized variables and possible out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_stereo3d: Add AVOption table terminatorMichael Niedermayer2013-03-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/deshake: support named options.Clément Bœsch2013-03-05
| |
* | doc/filters: make examples a bit more consistent.Clément Bœsch2013-03-05
| | | | | | | | | | Create dedicated subsection and itemize. Not done for every filters, but a large part is done.
* | doc/showspectrum: add some examples.Clément Bœsch2013-03-05
| |
* | lavfi/overlay: improve log message warning in case of clipped overlayStefano Sabatini2013-03-05
| |
* | lavfi/overlay: add support for partial overlayingStefano Sabatini2013-03-05
| | | | | | | | | | Partially rework the iteration logic, in order to limit iteration only for the clipped overlay region.
* | lavfi/mp: drop mp=stereo3d filterPaul B Mahol2013-03-05
| | | | | | | | | | | | The filter has been natively integrated into libavfilter. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi: port MP stereo3d filterPaul B Mahol2013-03-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/concat: compute duration if possible.Nicolas George2013-03-05
| |