summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | movenc: fix remuxing of svq3Piotr Bandurski2012-08-052-42/+8
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-055-7/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2 rational: add av_inv_q() returning the inverse of an AVRational dpx: Make start offset unsigned lavfi: properly signal out-of-memory error in ff_filter_samples cosmetics: Fix a few switched periods and linebreaks zerocodec: Fix memleak in decode_frame zerocodec: Cosmetics Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2Diego Biurrun2012-08-051-4/+4
| |
| * rational: add av_inv_q() returning the inverse of an AVRationalMans Rullgard2012-08-052-4/+13
| | | | | | | | | | | | This allows simplifying a few expressions. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dpx: Make start offset unsignedDerek Buitenhuis2012-08-051-1/+2
| | | | | | | | | | | | | | | | | | Some corrupted files would end up with a negative offset, and segfault. Fixes bug #177. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavfi: properly signal out-of-memory error in ff_filter_samplesReinhard Tartler2012-08-051-0/+4
| | | | | | | | Found with a clang-scan report on http://fate.libav.org/csa/
| * cosmetics: Fix a few switched periods and linebreaksDerek Buitenhuis2012-08-042-3/+3
| | | | | | | | | | | | Based on a patch by Piotr Bandurski. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * zerocodec: Fix memleak in decode_frameDerek Buitenhuis2012-08-041-5/+6
| | | | | | | | | | | | | | If there was a failure inflating, or reinitializing the zstream, the current frame's buffer would be lost. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * zerocodec: CosmeticsDerek Buitenhuis2012-08-041-12/+10
| | | | | | | | | | | | Be consistent with error messages and code formatting. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | oggdec: Initialize stream index to -1 in ogg_packet.Reimar Döffinger2012-08-051-3/+11
| | | | | | | | | | | | | | | | | | | | The previous method of having to initialize it outside lead to incorrect code: even if it was initialized, it usually was only initialized once, thus a packet that could not be matched to any stream would just be processed with the return values from the previous call. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | oggdec: simplify start time calculation code.Reimar Döffinger2012-08-051-6/+4
| | | | | | | | | | | | | | Also slightly more correct behaviour in case streams_left for some reason is 0 from the start. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | libtwolame MP2 encoding supportPaul B Mahol2012-08-056-0/+213
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | matroskaenc: Implement support for ALACMoritz Bunkus2012-08-051-0/+2
| |
* | ass subtitles: Fix valgrind warnings.Philip Langdale2012-08-052-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | We're now running some of this code through valgrind for the first time, and a few warnings showed up stemming from two problems. 1) The ASS code assumes the subtitle header is null terminated, but it wasn't, and passing the size down doesn't look like fun, so I added a terminator 2) The code wasn't freeing all of its state. Signed-off-by: Philip Langdale <philipl@overt.org>
* | matroskadec: prevent potential integer overflowMichael Niedermayer2012-08-051-1/+1
| | | | | | | | | | | | Iam not sure this can happen, but its safer we check. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Implement support for ALACMoritz Bunkus2012-08-052-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements support reading ALAC from Matroska files. The only non-trivial thing about it is that only the ALAC magic cookie is stored in Matroska's CodecPrivate element but not the "atom size", "tag" and "tag version" fields that FFMPEG's ALAC decoder expects. However, those are trivial to re-create. Sample files are available: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka and the CoreAudio file it was created from with today's mkvmerge: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add bitexact flag to fate-sub-movtextencMichael Niedermayer2012-08-052-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/options_table: mark flags as also for subtitlesMichael Niedermayer2012-08-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: fix typo in "@end table."Stefano Sabatini2012-08-051-1/+1
| | | | | | | | Remove erroneously added trailing dot.
* | movenc: Fix unfreed memory found by valgrind.Philip Langdale2012-08-051-1/+2
| | | | | | | | Signed-off-by: Philip Langdale <philipl@overt.org>
* | doc/filters: add mandelbrot source documentationStefano Sabatini2012-08-051-0/+73
| | | | | | | | Address trac ticket #1492.
* | lavf/img2dec: add start_number_range optionStefano Sabatini2012-08-053-10/+14
| |
* | examples/muxing: drop duplicated code in add_video_stream()Stefano Sabatini2012-08-051-6/+0
| |
* | configure: fix lib.exe checkHendrik Leppkes2012-08-051-1/+1
| | | | | | | | | | | | Running lib.exe without parameters will always result in an error, and failing the check. Using the -list paramter results in a success if lib.exe is present.
* | oggdec: check stream index before using it in ogg_get_length()Michael Niedermayer2012-08-051-0/+3
| | | | | | | | | | | | | | | | | | Fixes crash based on a uninitialized array index read. If the read does not crash then out of array writes based on the same index might have been triggered afterwards. Found-by: inferno@chromium.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/demuxers.texi: avoid comma splice in image2 documentationStefano Sabatini2012-08-051-1/+1
| | | | | | | | Add "and" proposition for connecting two sentences.
* | lavf/img2doc: document optionsStefano Sabatini2012-08-052-7/+30
| |
* | lavf/img2dec: improve error logging in case of find_image_range() failureStefano Sabatini2012-08-051-1/+5
| |
* | lavf/img2dec: sort options by nameStefano Sabatini2012-08-051-2/+2
| |
* | lavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in ↵Stefano Sabatini2012-08-051-2/+4
| | | | | | | | find_image_range
* | lavf/img2dec: fix out-of-range check in find_image_range()Stefano Sabatini2012-08-051-1/+1
| | | | | | | | Take the new parameter start_index into account.
* | lavf/img2dec: doxygen find_image_range() functionStefano Sabatini2012-08-051-1/+9
| |
* | lavf/img2dec: rename find_image_range() "max_start" parameter to "start_index"Stefano Sabatini2012-08-051-2/+2
| | | | | | | | | | | | | | The new name seems more consistent with the assumed logic. "start_index" represents the minimum accepted value as first index, and not the maximum value as implicitely assumed by the previous name.
* | lavf/img2dec: fix weird start_number count logicStefano Sabatini2012-08-051-2/+2
| | | | | | | | This seems consistent with the assumed meaning of the option.
* | examples/muxing: simplify alloc_picture()Stefano Sabatini2012-08-051-15/+3
| | | | | | | | Use avpicture_alloc() high level function.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-0452-181/+254
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: fix handling of custom mix matrices fate: force pix_fmt in lagarith-rgb32 test fate: add tests for lagarith lossless video codec. ARMv6: vp8: fix stack allocation with Apple's assembler ARM: vp56: allow inline asm to build with clang fft: 3dnow: fix register name typo in DECL_IMDCT macro x86: dct32: port to cpuflags x86: build: replace mmx2 by mmxext Revert "wmapro: prevent division by zero when sample rate is unspecified" wmapro: prevent division by zero when sample rate is unspecified lagarith: fix color plane inversion for YUY2 output. lagarith: pad RGB buffer by 1 byte. dsputil: make add_hfyu_left_prediction_sse4() support unaligned src. Conflicts: doc/APIchanges libavcodec/lagarith.c libavfilter/x86/gradfun.c libavutil/cpu.h libavutil/version.h libswscale/utils.c libswscale/version.h libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: fix handling of custom mix matricesJustin Ruggles2012-08-043-10/+26
| | | | | | | | | | Adds some validation for changing parameters after setting the matrix and fixes a bug in the conversion path setup.
| * fate: force pix_fmt in lagarith-rgb32 testMans Rullgard2012-08-041-1/+1
| | | | | | | | | | | | | | This makes big and little endian systems use the same output format. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: add tests for lagarith lossless video codec.Ronald S. Bultje2012-08-035-0/+51
| | | | | | | | Based on patch by Oana Stratulat <oanaandreeastratulat@gmail.com>.
| * ARMv6: vp8: fix stack allocation with Apple's assemblerMans Rullgard2012-08-041-1/+7
| | | | | | | | | | | | | | | | In the GNU assembler, a relational expression, bizarrely, has the value -1 if true, whereas in Apple's it is +1. This patch makes sure the correct expression is used in both cases. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: vp56: allow inline asm to build with clangMans Rullgard2012-08-041-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang integrated assembler does not support pre-UAL syntax, while gcc requires pre-UAL syntax for ARM code. A patch[1] for clang to support the old syntax as well has been ignored since January. This patch chooses the syntax appropriate for each compiler, allowing both to build the code. Notably, this change allows building for iphone with the latest Apple Xcode update. [1] http://llvm.org/bugs/show_bug.cgi?id=11855 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft: 3dnow: fix register name typo in DECL_IMDCT macroRonald S. Bultje2012-08-041-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * x86: dct32: port to cpuflagsDiego Biurrun2012-08-031-49/+25
| |
| * x86: build: replace mmx2 by mmxextDiego Biurrun2012-08-0338-108/+120
| | | | | | | | | | | | | | Refactoring mmx2/mmxext YASM code with cpuflags will force renames. So switching to a consistent naming scheme beforehand is sensible. The name "mmxext" is more official and widespread and also the name of the CPU flag, as reported e.g. by the Linux kernel.
| * Revert "wmapro: prevent division by zero when sample rate is unspecified"Ronald S. Bultje2012-08-031-5/+0
| | | | | | | | | | This reverts commit 36936080239ba9e162f9f5d0f722ce579cb606cf. It was already applied; no idea why it didn't error out while re-applying it.
| * wmapro: prevent division by zero when sample rate is unspecifiedSean McGovern2012-08-031-0/+5
| | | | | | | | | | | | This fixes Bugzilla #327: Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lagarith: fix color plane inversion for YUY2 output.Ronald S. Bultje2012-08-031-3/+3
| |
| * lagarith: pad RGB buffer by 1 byte.Ronald S. Bultje2012-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | For left HFYU prediction, we predict from the buffer buf+1 using 8- or 16-byte reads. This means that aligning the buffer by 16 bytes is in itself not sufficient, because if the width itself is 16- or 8-byte aligned, the buffer will not be padded, and thus a read of size 16 at buf+1 will overflow boundaries at the right edge. Padding the buffer by 1 byte is sufficient to not overflow its boundaries. Fixes bug 342.
| * dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.Ronald S. Bultje2012-08-031-7/+13
| | | | | | | | | | | | | | | | | | | | This makes add_hfyu_left_prediction_sse4() handle sources that are not 16-byte aligned in its own function rather than by proxying the call to add_hfyu_left_prediction_ssse3(). This fixes a crash on Win64, since the sse4 version clobberes xmm6, but the ssse3 version (which uses MMX regs) does not restore it, thus leading to XMM clobbering and RSP being off. Fixes bug 342.
* | ffmpeg: insert bitmap subtitles as video in filters.Nicolas George2012-08-043-4/+191
| | | | | | | | | | | | | | | | | | With this feature, it becomes possible to perform commonly requested tasks, such as hardcoding bitmap subtitles. This will be reverted once libavfilter has proper support for subtitles. All the changes have the string "sub2video" in them, it makes it easy to spot the parts.