summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer2013-03-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efa7f4202088c70caba11d7834641bc6eaf41830': Use the avstring.h locale-independent character type functions avstring: Add locale independent versions of some ctype.h functions Conflicts: avprobe.c doc/APIchanges libavcodec/dvdsubdec.c libavcodec/utils.c libavutil/avstring.c libavutil/avstring.h libavutil/eval.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-07
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avstring: Add locale independent versions of some ctype.h functionsReimar Döffinger2013-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | MAINTAINERS: update for 1.2Michael Niedermayer2013-03-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "aacdec: Reconfigure output as needed, disable ↵Michael Niedermayer2013-03-08
| | | | | | | | | | | | | | | | pop_output_configuration()" This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade. This is not needed anymore, Ticket 1694 has been fixed differently
* | aacsbr: Check for envelope scalefactors overflowingMichael Niedermayer2013-03-08
| | | | | | | | | | | | | | | | | | | | This prevents various values from becoming stuck at NAN and output to become silent If someone knows a cleaner solution, thats welcome! Fixes Ticket2335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Close output codecs if input codec initialisation fails.Carl Eugen Hoyos2013-03-08
| | | | | | | | Fixes ticket #1546 and the remaining part of ticket #1244.
* | Add dependencies for the voice fate tests.Carl Eugen Hoyos2013-03-08
| |
* | Add dependencies for the flac encoding fate tests.Carl Eugen Hoyos2013-03-08
| |
* | Add dependencies for the aac encoding fate tests.Carl Eugen Hoyos2013-03-08
| |
* | Force using a 64bit intermediate when calculating calendar time with ↵Carl Eugen Hoyos2013-03-08
| | | | | | | | | | | | av_timegm(). Fixes a fate failure with icc 13.1
* | mpegaudio_parser: Don't ignore information from the first frameAlexander Kojevnikov2013-03-07
| | | | | | | | | | Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: Reconfigure output as needed, disable pop_output_configuration()Michael Niedermayer2013-03-07
| | | | | | | | | | | | Fixes Ticket1694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | psymodel: dont apply lowpass filters with a cutoff close to the nyquistMichael Niedermayer2013-03-07
| | | | | | | | | | | | | | | | | | The IIR filter numerically diverges in such cases, this could easily be fixed but would make the filter slower on some platforms Fixes Ticket2246 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix apics with aacMichael Niedermayer2013-03-07
| | | | | | | | | | | | Fixes Ticket2318 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hls: fix timebaseMichael Niedermayer2013-03-07
| | | | | | | | | | | | Fixes Ticket1733 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Deprecate the deinterlace functions in libavcodec h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band Conflicts: configure ffmpeg_opt.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Deprecate the deinterlace functions in libavcodecRonald S. Bultje2013-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Integrate draw_horiz_band into ff_h264_draw_horiz_bandRonald S. Bultje2013-03-07
| | | | | | | | | | | | | | | | | | | | This makes the decoder independent of mpegvideo. This copy of the draw_horiz_band code is simplified compared to the "generic" mpegvideo one which still has a number of special cases for different codecs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'Michael Niedermayer2013-03-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '70762508ec5919474edb92a5b1f266fd06640f9c': lavc: Prettify printing of codec tags containing non alphanumeric characters h264: Rename the jpeg_420 pixfmt list to match the common naming structure Conflicts: libavcodec/h264.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Prettify printing of codec tags containing non alphanumeric charactersStefano Sabatini2013-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | Make av_get_codec_tag_string() show codec tag string characters in a more intelligible ways. For example the ascii char "@" is used as a number, so should be displayed like "[64]" rather than as a printable character. Apart alphanumeric chars, only the characters ' ' and '.' are used literally in codec tags, all the other characters represent numbers. This also avoids relying on locale-dependent character class functions. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Rename the jpeg_420 pixfmt list to match the common naming structureMartin Storsjö2013-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavcodec: changed mathematical functions in aacpsy.cBojan Zivkovic2013-03-07
| | | | | | | | | | | | | | | | | | This patch changes existing mathematical functions with faster ones. Speeds up encoding more than 10%. Tested on x86 and MIPS platforms. Signed-off-by: Bojan Zivkovic <bojan@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>