summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-067-95/+122
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: nuv: K&R formatting cosmetics build: generalise rules and variable settings for av* programs nuv: check RTjpeg header for validity Revert "nuv: check per-frame header for validity." imc: remove unused field IMCContext.one_div_log2 imc: fix size of a memset() imc: remove empty if() block fate: simplify variable setting filter.mak lavf: Declare an AVRational struct without a struct literal Conflicts: Makefile configure libavcodec/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nuv: K&R formatting cosmeticsDiego Biurrun2012-08-061-70/+96
| |
| * build: generalise rules and variable settings for av* programsMans Rullgard2012-08-062-8/+15
| | | | | | | | | | | | | | This simplifies adding extra flags for individual programs and also allows more than one object file per program. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * nuv: check RTjpeg header for validityJanne Grunau2012-08-062-4/+8
| | | | | | | | CC: libav-stable@libav.org
| * Revert "nuv: check per-frame header for validity."Janne Grunau2012-08-061-3/+3
| | | | | | | | | | | | | | | | | | The check is bogus since the nuv frameheader is already skipped and the (decompressed) RTjpeg header is checked. This reverts commit f6afacdb3b708720c9fb85984b4f7fdbca2b2036. CC: libav-stable@libav.org
| * imc: remove unused field IMCContext.one_div_log2Mans Rullgard2012-08-061-2/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * imc: fix size of a memset()Mans Rullgard2012-08-061-1/+1
| | | | | | | | | | | | | | IMCContext was changed from an array to a pointer in 66b84e4, but this memset() was not updated. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * imc: remove empty if() blockMans Rullgard2012-08-061-3/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: simplify variable setting filter.makMans Rullgard2012-08-061-7/+2
| | | | | | | | | | | | This removes some needless indirection and duplication. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: Declare an AVRational struct without a struct literalMartin Storsjö2012-08-061-1/+1
| | | | | | | | | | | | | | At this place, the normal way of initializing a struct works fine, there's no need for a struct literal. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avidec: parse INFO tags at the endMichael Niedermayer2012-08-061-5/+12
| | | | | | | | | | | | Fixes Ticket1123 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | msrle: fix extradata palette handlingMichael Niedermayer2012-08-061-3/+8
| | | | | | | | | | | | Fixes Ticket1273 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: refactor frames decoding.Nicolas George2012-08-061-27/+22
| |
* | mpegvideo: remove last_picture_ptr / h264 assert.Michael Niedermayer2012-08-061-3/+0
| | | | | | | | | | | | | | This assert is no longer true since h264 error concealment needs last_picture_ptr to be set. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo.c: convert some asserts to av_assertMichael Niedermayer2012-08-061-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1enc: set picture_structure correctlyMichael Niedermayer2012-08-061-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_enc: switch some assert to av_assertMichael Niedermayer2012-08-061-19/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_enc: remove assert that has become obsolete with the new APIMichael Niedermayer2012-08-061-1/+0
| | | | | | | | | | | | it now just checks uninitialized and unused data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: do not call pthread_{mutex,cond}_destroy when not initialized.anonymous2012-08-061-3/+2
| | | | | | | | | | | | This seems to cause a crash on Windows. The author of that patch was a random guy on IRC who wants to stay anonymous.
* | shorten: fix cmd typeMichael Niedermayer2012-08-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpc7: remove duplicated definitionsPaul B Mahol2012-08-061-4/+0
| | | | | | | | | | | | They are available in mpc.h Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mpc8: fix ptsMichael Niedermayer2012-08-061-1/+1
| | | | | | | | | | | | Fixes Ticket1254 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: dont clip timestamps at 0Michael Niedermayer2012-08-061-2/+0
| | | | | | | | | | | | Fixes Ticket1251 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: make libtwolame check more robustPaul B Mahol2012-08-051-1/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | movenv: fix remuxing of qdm2Piotr Bandurski2012-08-061-2/+7
| |
* | aiffenc: fix remuxing of qdm2Piotr Bandurski2012-08-061-0/+6
| |
* | Replace various inlined inverse AVRational with av_inv_q().Clément Bœsch2012-08-0610-13/+12
| |
* | lavfi/overlay: remove dead initialization.Clément Bœsch2012-08-061-1/+1
| |
* | 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
| |
OpenPOWER on IntegriCloud