]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Tue, 6 Dec 2011 22:06:27 +0000 (23:06 +0100)]
Fix 8BPS RGB32 output, the alpha channel was ignored.
Reviewed-by: Roberto Togni
Reimar Döffinger [Tue, 6 Dec 2011 18:48:16 +0000 (19:48 +0100)]
Choose compression level 6 for zmbv test.
The default of 9 gives different results on different FATE systems.
However the zlib test using compression level 6 works, so
try this instead.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Tue, 6 Dec 2011 16:40:40 +0000 (17:40 +0100)]
movdec: remove redundant size<=8 check.
Its checked a few lines below too.
The only difference is that empty atoms with size=0 will now get parsed too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Dec 2011 16:35:52 +0000 (17:35 +0100)]
movdec: Read extended 64bit size before the debug av_log() and only when there
was enough space to read the 32bit size.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mihnea Balta [Tue, 6 Dec 2011 07:29:47 +0000 (09:29 +0200)]
movdec: Fix bad computed size for atoms with size 0 in MOV files
The computed size doesn't contain the header size because it's already
skipped by incrementing total_size, but then it's skipped again in the
last line. The atom comes out 8 bytes short and the function
mov_read_chan() aborts the whole parsing process. I think the computed
size should be atom.size - total_size + 8.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Dec 2011 16:21:05 +0000 (17:21 +0100)]
mov: increase total_size only when it actually increases.
This is just cosmetic as the if() is always true.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Dec 2011 15:21:10 +0000 (16:21 +0100)]
movenc: support spliting fragments based on bytesize instead of duration.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Dec 2011 15:15:35 +0000 (16:15 +0100)]
movenc: fragment support
Reviewed-by: Baptiste Coudurier
Tested-with-QT: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Dec 2011 15:01:21 +0000 (16:01 +0100)]
ffmpeg: Warn if filters poll & request frame behave wrongly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 4 Dec 2011 22:49:03 +0000 (23:49 +0100)]
vsrc_life: fix comment in parse_rule()
Stefano Sabatini [Sun, 4 Dec 2011 22:33:40 +0000 (23:33 +0100)]
vf_scale: give a clue in case of invalid expression self-reference
Address trac ticket #706.
Michael Niedermayer [Tue, 6 Dec 2011 00:37:27 +0000 (01:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* 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>
Carl Eugen Hoyos [Mon, 5 Dec 2011 23:16:22 +0000 (00:16 +0100)]
Do not fail fatally if chan atom is too short.
Gavin Kinsey [Mon, 5 Dec 2011 15:15:29 +0000 (15:15 +0000)]
Fix compilation for C++ applications
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Dec 2011 17:04:19 +0000 (18:04 +0100)]
movdec: Fix parsing of a very last empty atom of size 8.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 29 Nov 2011 23:13:54 +0000 (00:13 +0100)]
Add tests for several encoders.
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>
Reimar Döffinger [Tue, 29 Nov 2011 23:06:25 +0000 (00:06 +0100)]
vf_scale: support PAL8 output by producing BGR8.
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>
Reimar Döffinger [Tue, 29 Nov 2011 21:01:09 +0000 (22:01 +0100)]
Add coverage exclusions for test code.
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>
Reimar Döffinger [Tue, 29 Nov 2011 19:35:48 +0000 (20:35 +0100)]
Add coverage support.
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>
Alex Converse [Mon, 5 Dec 2011 00:38:05 +0000 (16:38 -0800)]
mov: Don't av_malloc(0).
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.
Justin Ruggles [Mon, 5 Dec 2011 16:49:38 +0000 (11:49 -0500)]
avconv: only allocate 1 AVFrame per input stream
This avoids allocating/freeing an AVFrame for each packet decode. It also
simplifies error handling in transcode_audio() and transcode_video().
Justin Ruggles [Mon, 5 Dec 2011 15:36:54 +0000 (10:36 -0500)]
avconv: fix memleaks due to not freeing the AVFrame for audio
Ronald S. Bultje [Sat, 26 Nov 2011 21:10:17 +0000 (13:10 -0800)]
h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
Michael Niedermayer [Mon, 5 Dec 2011 12:23:17 +0000 (13:23 +0100)]
lavc: Mark fields that require av_opt_ptr()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Dec 2011 12:22:46 +0000 (13:22 +0100)]
lavc: Fix sizeof(AVFrame) useability docs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Dec 2011 12:22:20 +0000 (13:22 +0100)]
lavc: Document AVFrame av_opt_ptr() relation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 30 Oct 2011 18:10:50 +0000 (19:10 +0100)]
misc Doxygen markup improvements
Diego Biurrun [Sun, 30 Oct 2011 17:27:33 +0000 (18:27 +0100)]
doxygen: eliminate Qt-style doxygen syntax
Martin Storsjö [Sat, 3 Dec 2011 22:58:31 +0000 (00:58 +0200)]
g722: Add a regression test for muxing/demuxing in wav
Signed-off-by: Martin Storsjö <martin@martin.st>
Sjoerd Simons [Thu, 1 Dec 2011 23:08:35 +0000 (01:08 +0200)]
g722: Change bits per sample to 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>
Martin Storsjö [Sat, 3 Dec 2011 17:54:20 +0000 (19:54 +0200)]
g722dec: Signal skipping the lower bits via AVOptions instead of 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>
Michael Niedermayer [Sat, 3 Dec 2011 20:21:30 +0000 (21:21 +0100)]
ffplay: Avoid directly accessing AVFrame fields that differ between forks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 20:20:50 +0000 (21:20 +0100)]
ffmpeg: Avoid directly accessing AVFrame fields that differ between forks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 20:17:52 +0000 (21:17 +0100)]
lavc: Add a AVClass for AVFrames.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 20:16:46 +0000 (21:16 +0100)]
av_opt: add av_opt_ptr() to return a pointer to a field of a object based on
an AVClass
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Dec 2011 02:19:28 +0000 (03:19 +0100)]
ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Fri, 11 Nov 2011 20:44:41 +0000 (15:44 -0500)]
api-example: update to use avcodec_decode_audio4()
Justin Ruggles [Wed, 12 Oct 2011 17:27:41 +0000 (13:27 -0400)]
avplay: use avcodec_decode_audio4()
Justin Ruggles [Tue, 11 Oct 2011 19:49:39 +0000 (15:49 -0400)]
avplay: use a separate buffer for playing silence
Justin Ruggles [Wed, 2 Nov 2011 18:35:36 +0000 (14:35 -0400)]
avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
Justin Ruggles [Mon, 21 Nov 2011 22:41:49 +0000 (17:41 -0500)]
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
Alex Converse [Sat, 3 Dec 2011 01:00:11 +0000 (17:00 -0800)]
mov: Allow empty stts atom.
Fixes regressions caused by
30c3d976
Michael Niedermayer [Sun, 4 Dec 2011 23:11:57 +0000 (00:11 +0100)]
Merge remote-tracking branch 'qatar/master'
* 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>
Diego Biurrun [Tue, 8 Nov 2011 14:01:47 +0000 (15:01 +0100)]
doc: document preferred Doxygen syntax and make patcheck detect it
Chris Berov [Fri, 2 Dec 2011 19:52:49 +0000 (21:52 +0200)]
adpcmenc: cosmetics: pretty-printing
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Chris Berov [Fri, 2 Dec 2011 15:46:01 +0000 (17:46 +0200)]
ac3dec: cosmetics: pretty-printing
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Chris Berov [Wed, 30 Nov 2011 11:16:07 +0000 (13:16 +0200)]
yuv4mpeg: cosmetics: pretty-printing
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Stefano Sabatini [Sun, 26 Jun 2011 17:47:18 +0000 (19:47 +0200)]
lavfi: add life source
Stefano Sabatini [Fri, 2 Dec 2011 14:33:15 +0000 (15:33 +0100)]
aevalsrc: add duration option
Paul B. Mahol [Tue, 29 Nov 2011 01:52:58 +0000 (01:52 +0000)]
shorten: remove dead initialization
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Peter Ross [Sun, 4 Dec 2011 06:45:24 +0000 (17:45 +1100)]
Microsoft Windows ICO demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 5 Nov 2011 22:27:00 +0000 (23:27 +0100)]
roqvideodec: set AVFrame reference before reget_buffer.
Otherwise it might return a write-only frame which would break
decoding completely.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Carl Eugen Hoyos [Thu, 10 Nov 2011 22:07:27 +0000 (23:07 +0100)]
bmp: fix some 1bit samples.
<= 8bpp BMP images always have palette.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Janne Grunau [Fri, 2 Dec 2011 23:21:06 +0000 (00:21 +0100)]
latmdec: add fate test for audio config change
Michael Niedermayer [Sun, 4 Dec 2011 14:31:58 +0000 (15:31 +0100)]
doc/filters.texi: Update drawtext docs so that the documented input width/height variables are compatible with qatar.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Dec 2011 14:29:26 +0000 (15:29 +0100)]
vf_drawtext: support W/H parameters to reduce UI differences to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Dec 2011 14:26:52 +0000 (15:26 +0100)]
ffmpeg: select best pixel format for the encoder if no exact match.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
David Goldwich [Fri, 2 Dec 2011 04:54:21 +0000 (05:54 +0100)]
oma: PCM support
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
David Goldwich [Fri, 2 Dec 2011 04:54:20 +0000 (05:54 +0100)]
oma: better format detection with small probe buffer
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
David Goldwich [Fri, 2 Dec 2011 04:54:19 +0000 (05:54 +0100)]
oma: clearify ambiguous if condition
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 4 Dec 2011 01:27:13 +0000 (02:27 +0100)]
vf_drawtext: cosmetics to reduce diff to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Dec 2011 01:08:56 +0000 (02:08 +0100)]
vf_drawtext: Add main_w/h to improve compatibility with the modified UI
from the fork.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Dec 2011 00:41:22 +0000 (01:41 +0100)]
h264: show when has_b_frames is being increased.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Dec 2011 00:02:37 +0000 (01:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: fix frame reordering code.
fate: Add a test for the VBLE decoder
doc: break some long lines in developer.texi
drawtext: make x and y parametric
drawtext: manage memory allocation better
drawtext: refactor draw_text
doc: remove space between variable and post increment in example code
Conflicts:
doc/developer.texi
doc/filters.texi
libavcodec/h264.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 3 Dec 2011 19:35:23 +0000 (14:35 -0500)]
wavpack: Properly clip samples during lossy decode
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>
Yordan Makariev [Sat, 3 Dec 2011 18:25:57 +0000 (20:25 +0200)]
Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Tsvetelina Borisova [Sat, 3 Dec 2011 18:23:52 +0000 (20:23 +0200)]
Cleaned pixdesc.c file in libavutil
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Nathan Adil Maxson [Fri, 2 Dec 2011 19:08:56 +0000 (11:08 -0800)]
zmbv.c: coding style clean-up.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Nathan Adil Maxson [Fri, 2 Dec 2011 23:00:16 +0000 (15:00 -0800)]
xan.c: coding style clean-up.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Konstantin Todorov [Wed, 30 Nov 2011 20:55:45 +0000 (22:55 +0200)]
mpegvideo.c: code cleanup - first 500 lines.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Sat, 3 Dec 2011 17:58:28 +0000 (18:58 +0100)]
flvdec: Stop searching for streams once a audio & a video stream has been found
instead of when the 2nd stream has been found.
This isnt ideal as we will likely still like before miss a data stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 3 Dec 2011 19:46:42 +0000 (20:46 +0100)]
Add forgotten %ifdef HAVE_AVX.
Fixes compilation with older YASM/NASM versions.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Ronald S. Bultje [Wed, 30 Nov 2011 06:22:44 +0000 (22:22 -0800)]
h264: fix frame reordering code.
Fixes fate-h264-conformance-{mr2_tandberg_e,mr3_tandberg_b} without
requiring -strict 1.
Nicolas George [Sat, 3 Dec 2011 10:21:30 +0000 (11:21 +0100)]
lavu/error: define AVERROR_BUG.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 3 Dec 2011 10:21:29 +0000 (11:21 +0100)]
avutil: av_x_if_null: remove const for the return value.
This is the usual weirdness with const/non-const pointers through a function.
See the prototype of strchr for a standard example.
The function had to be moved down, below the point where stdint.h is
indirectly included.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 14:03:49 +0000 (15:03 +0100)]
ffmpeg: use standard duration calculation code in the stream copy case.
Fixes a.mkv non monotonic timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ami_stuff [Sat, 3 Dec 2011 11:34:12 +0000 (12:34 +0100)]
BMP: Support BMP OS/2 v2 with RLE compression.
Fixes ticket #699.
Patch also provided by Peter Ross.
Carl Eugen Hoyos [Sat, 3 Dec 2011 11:29:41 +0000 (12:29 +0100)]
Allow last mov chunk to have an arbitrary number of samples.
Fixes ticket #673.
Carl Eugen Hoyos [Sat, 3 Dec 2011 11:22:12 +0000 (12:22 +0100)]
Support decoding right-to-left targa files.
Fixes ticket #698.
Nicolas George [Sat, 3 Dec 2011 10:52:48 +0000 (11:52 +0100)]
celtdec: adapt to avcodec_decode_audio4.
Original fix by Michael Niedermayer.
Slightly modified to avoid the now redundant multiplications
and divisions in the main code path.
Michael Niedermayer [Sat, 3 Dec 2011 04:27:04 +0000 (05:27 +0100)]
oma: Fix out of array read.
Input: 01-Untitled-partial.oma
ZZUF params: zzuf[s=7157,r=0.001]
Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 04:04:31 +0000 (05:04 +0100)]
id3v2: Fix null ptr crash in get_extra_meta_func()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 03:50:35 +0000 (04:50 +0100)]
zmbv: fix 2 memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 03:42:36 +0000 (04:42 +0100)]
zmbv: Fix keyframe fault protextion.
Fixes zzuf -s467 -r0.001 cat samples/zmbv/wc2_001-partial.avi
Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 03:25:34 +0000 (04:25 +0100)]
audeo_get_buffer: fix pkt_pos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 02:45:05 +0000 (03:45 +0100)]
developer.texi: Fix naming convention
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 3 Dec 2011 02:01:58 +0000 (13:01 +1100)]
iff: support ExtraHalfBrite (EHB) palette mode
Fixes ticket #663.
Based on patch by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 3 Dec 2011 01:21:33 +0000 (12:21 +1100)]
pictordec: decode 8bpp images when extra header marker is missing
Fixes ticket #696.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 3 Dec 2011 02:31:24 +0000 (03:31 +0100)]
Silence warnings when decoding QNAP Systems H264 codec.
Fixes ticket #571.
Clément Bœsch [Fri, 2 Dec 2011 23:45:46 +0000 (00:45 +0100)]
lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
Michael Niedermayer [Sat, 3 Dec 2011 01:43:58 +0000 (02:43 +0100)]
g723_1dec: update to new API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 01:26:01 +0000 (02:26 +0100)]
g729dec: update to the new API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Dec 2011 01:08:55 +0000 (02:08 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac_latm: reconfigure decoder on audio specific config changes
latmdec: fix audio specific config parsing
Add avcodec_decode_audio4().
avcodec: change number of plane pointers from 4 to 8 at next major bump.
Update developers documentation with coding conventions.
svq1dec: avoid undefined get_bits(0) call
ARM: h264dsp_neon cosmetics
ARM: make some NEON macros reusable
Do not memcpy raw video frames when using null muxer
fate: update asf seektest
vp8: flush buffers on size changes.
doc: improve general documentation for MacOSX
asf: use packet dts as approximation of pts
asf: do not call av_read_frame
rtsp: Initialize the media_type_mask in the rtp guessing demuxer
Cleaned up alacenc.c
Conflicts:
doc/APIchanges
doc/developer.texi
libavcodec/8svx.c
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/nellymoserdec.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmadec.c
libavformat/asfdec.c
tests/ref/seek/lavf_asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Thu, 1 Dec 2011 20:24:08 +0000 (20:24 +0000)]
fate: Add a test for the VBLE decoder
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Luca Barbato [Sat, 3 Dec 2011 00:18:28 +0000 (01:18 +0100)]
doc: break some long lines in developer.texi
Luca Barbato [Thu, 1 Dec 2011 10:43:11 +0000 (11:43 +0100)]
drawtext: make x and y parametric
Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly.
Luca Barbato [Thu, 1 Dec 2011 10:27:19 +0000 (11:27 +0100)]
drawtext: manage memory allocation better
Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed
Luca Barbato [Thu, 1 Dec 2011 10:14:54 +0000 (11:14 +0100)]
drawtext: refactor draw_text
Split the memory allocation from the actual drawing.
Janne Grunau [Sat, 3 Dec 2011 00:11:12 +0000 (01:11 +0100)]
doc: remove space between variable and post increment in example code
Michael Niedermayer [Fri, 2 Dec 2011 23:46:46 +0000 (00:46 +0100)]
swr-test: drop one const, silence most const qualifer warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>