aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-0634-272/+330
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Don't av_malloc(0). avconv: only allocate 1 AVFrame per input stream avconv: fix memleaks due to not freeing the AVFrame for audio h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg). misc Doxygen markup improvements doxygen: eliminate Qt-style doxygen syntax g722: Add a regression test for muxing/demuxing in wav g722: Change bits per sample to 4 g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample api-example: update to use avcodec_decode_audio4() avplay: use avcodec_decode_audio4() avplay: use a separate buffer for playing silence avformat: use avcodec_decode_audio4() in avformat_find_stream_info() avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3() mov: Allow empty stts atom. doc: document preferred Doxygen syntax and make patcheck detect it Conflicts: avconv.c ffplay.c libavcodec/mlpdec.c libavcodec/version.h libavformat/mov.c tests/codec-regression.sh tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Don't av_malloc(0).Alex Converse2011-12-051-0/+10
| | | | | | | | | | | | | | malloc() is allowed to return NULL when zero is the argument. This causes us to think malloc has failed and return AVERROR(ENOMEM). In addition OS X malloc() returns an unfreeable non-NULL pointer for size zero when alignment is greater than 16.
| * avconv: only allocate 1 AVFrame per input streamJustin Ruggles2011-12-051-16/+21
| | | | | | | | | | This avoids allocating/freeing an AVFrame for each packet decode. It also simplifies error handling in transcode_audio() and transcode_video().
| * avconv: fix memleaks due to not freeing the AVFrame for audioJustin Ruggles2011-12-051-0/+4
| |
| * h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).Ronald S. Bultje2011-12-051-64/+64
| |
| * misc Doxygen markup improvementsDiego Biurrun2011-12-058-17/+17
| |
| * doxygen: eliminate Qt-style doxygen syntaxDiego Biurrun2011-12-0510-49/+49
| |
| * g722: Add a regression test for muxing/demuxing in wavMartin Storsjö2011-12-052-0/+9
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * g722: Change bits per sample to 4Sjoerd Simons2011-12-053-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, bits per sample was defined as 8, since bits_per_coded_sample was used to indicate whether to ignore the lower bits of the codeword, having values 6, 7 or 8. g722 encodes 2 samples into one byte codeword, therefore the bits per sample is 4. By changing this, the generated timestamps for streams encoded with g722 become correct. This makes timestamp generation for g722 data correct (both when encoding and when demuxing from raw g722 files). Signed-off-by: Martin Storsjö <martin@martin.st>
| * g722dec: Signal skipping the lower bits via AVOptions instead of ↵Martin Storsjö2011-12-052-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bits_per_coded_sample This avoids using bits_per_coded_sample for this information. bits_per_coded_sample should be 4 for this codec normally, since two samples are encoded into one 8 bit codeword. In principle, this might be info that needs to be passed from a demuxer, and in that case, a private AVOption isn't the best choice, but no such samples are available at the moment, so that use case is purely theoretical at the moment. Signed-off-by: Martin Storsjö <martin@martin.st>
| * api-example: update to use avcodec_decode_audio4()Justin Ruggles2011-12-041-9/+20
| |
| * avplay: use avcodec_decode_audio4()Justin Ruggles2011-12-041-16/+27
| |
| * avplay: use a separate buffer for playing silenceJustin Ruggles2011-12-041-3/+3
| |
| * avformat: use avcodec_decode_audio4() in avformat_find_stream_info()Justin Ruggles2011-12-041-15/+16
| |
| * avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()Justin Ruggles2011-12-041-29/+26
| |
| * mov: Allow empty stts atom.Alex Converse2011-12-041-1/+3
| | | | | | | | Fixes regressions caused by 30c3d976
| * doc: document preferred Doxygen syntax and make patcheck detect itDiego Biurrun2011-12-042-0/+6
| |
* | Do not fail fatally if chan atom is too short.Carl Eugen Hoyos2011-12-061-1/+1
| |
* | Fix compilation for C++ applicationsGavin Kinsey2011-12-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movdec: Fix parsing of a very last empty atom of size 8.Michael Niedermayer2011-12-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add tests for several encoders.Reimar Döffinger2011-12-059-0/+52
| | | | | | | | | | | | | | More specifically, PNG, v210, zlib and zmbv codecs. zmbv needs vf_scale to be able to produce PAL8. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | vf_scale: support PAL8 output by producing BGR8.Reimar Döffinger2011-12-057-4/+12
| | | | | | | | | | | | | | While quality is bad, PAL8 support is needed to allow testing some encoders that only support PAL8 input. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add coverage exclusions for test code.Reimar Döffinger2011-12-055-0/+12
| | | | | | | | | | | | | | | | For some of the code e.g. doing timing measurements there is no real point in running regression testing on it, thus it should not be counted against coverage. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add coverage support.Reimar Döffinger2011-12-053-1/+15
| | | | | | | | | | | | | | | | Adds --enable-coverage to configure and a "coverage-html" make target. The dependency stuff in the Makefile is a bit questionable, but the best I could think of so far. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavc: Mark fields that require av_opt_ptr()Michael Niedermayer2011-12-051-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: Fix sizeof(AVFrame) useability docsMichael Niedermayer2011-12-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: Document AVFrame av_opt_ptr() relation.Michael Niedermayer2011-12-051-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: Avoid directly accessing AVFrame fields that differ between forks.Michael Niedermayer2011-12-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Avoid directly accessing AVFrame fields that differ between forks.Michael Niedermayer2011-12-051-4/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: Add a AVClass for AVFrames.Michael Niedermayer2011-12-052-0/+32
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_opt: add av_opt_ptr() to return a pointer to a field of a object based onMichael Niedermayer2011-12-052-0/+19
| | | | | | | | | | | | an AVClass Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.Michael Niedermayer2011-12-051-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-0519-1559/+1784
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcmenc: cosmetics: pretty-printing ac3dec: cosmetics: pretty-printing yuv4mpeg: cosmetics: pretty-printing shorten: remove dead initialization roqvideodec: set AVFrame reference before reget_buffer. bmp: fix some 1bit samples. latmdec: add fate test for audio config change oma: PCM support oma: better format detection with small probe buffer oma: clearify ambiguous if condition wavpack: Properly clip samples during lossy decode Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c. Cleaned pixdesc.c file in libavutil zmbv.c: coding style clean-up. xan.c: coding style clean-up. mpegvideo.c: code cleanup - first 500 lines. Conflicts: Changelog libavcodec/adpcmenc.c libavcodec/bmp.c libavcodec/zmbv.c libavutil/log.c libavutil/pixdesc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcmenc: cosmetics: pretty-printingChris Berov2011-12-041-229/+264
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * ac3dec: cosmetics: pretty-printingChris Berov2011-12-041-248/+261
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * yuv4mpeg: cosmetics: pretty-printingChris Berov2011-12-041-115/+133
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * shorten: remove dead initializationPaul B. Mahol2011-12-041-1/+0
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * roqvideodec: set AVFrame reference before reget_buffer.Reimar Döffinger2011-12-041-0/+1
| | | | | | | | | | | | | | Otherwise it might return a write-only frame which would break decoding completely. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * bmp: fix some 1bit samples.Carl Eugen Hoyos2011-12-041-4/+18
| | | | | | | | | | | | <= 8bpp BMP images always have palette. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * latmdec: add fate test for audio config changeJanne Grunau2011-12-041-0/+4
| |
| * oma: PCM supportDavid Goldwich2011-12-042-3/+15
| | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * oma: better format detection with small probe bufferDavid Goldwich2011-12-041-5/+11
| | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * oma: clearify ambiguous if conditionDavid Goldwich2011-12-041-2/+2
| | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * wavpack: Properly clip samples during lossy decodeDerek Buitenhuis2011-12-031-2/+9
| | | | | | | | | | | | | | | | When decoding lossy WavPack samples, they are supposed to be clipped, in order to be decoded correctly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.Yordan Makariev2011-12-036-236/+287
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Cleaned pixdesc.c file in libavutilTsvetelina Borisova2011-12-031-483/+484
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * zmbv.c: coding style clean-up.Nathan Adil Maxson2011-12-031-90/+101
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * xan.c: coding style clean-up.Nathan Adil Maxson2011-12-031-25/+28
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * mpegvideo.c: code cleanup - first 500 lines.Konstantin Todorov2011-12-031-135/+202
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | lavfi: add life sourceStefano Sabatini2011-12-046-2/+522
| |