ffmpeg.git
8 years agomov: increase total_size only when it actually increases.
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>
8 years agomovenc: support spliting fragments based on bytesize instead of duration.
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>
8 years agomovenc: fragment support
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>
8 years agoffmpeg: Warn if filters poll & request frame behave wrongly.
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>
8 years agovsrc_life: fix comment in parse_rule()
Stefano Sabatini [Sun, 4 Dec 2011 22:49:03 +0000 (23:49 +0100)]
vsrc_life: fix comment in parse_rule()

8 years agovf_scale: give a clue in case of invalid expression self-reference
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.

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoDo not fail fatally if chan atom is too short.
Carl Eugen Hoyos [Mon, 5 Dec 2011 23:16:22 +0000 (00:16 +0100)]
Do not fail fatally if chan atom is too short.

8 years agoFix compilation for C++ applications
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>
8 years agomovdec: Fix parsing of a very last empty atom of size 8.
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>
8 years agoAdd tests for several encoders.
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>
8 years agovf_scale: support PAL8 output by producing BGR8.
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>
8 years agoAdd coverage exclusions for test code.
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>
8 years agoAdd coverage support.
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>
8 years agomov: Don't av_malloc(0).
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.

8 years agoavconv: only allocate 1 AVFrame per input stream
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().

8 years agoavconv: fix memleaks due to not freeing the AVFrame for audio
Justin Ruggles [Mon, 5 Dec 2011 15:36:54 +0000 (10:36 -0500)]
avconv: fix memleaks due to not freeing the AVFrame for audio

8 years agoh264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
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).

8 years agolavc: Mark fields that require av_opt_ptr()
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>
8 years agolavc: Fix sizeof(AVFrame) useability docs
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>
8 years agolavc: Document AVFrame av_opt_ptr() relation.
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>
8 years agomisc Doxygen markup improvements
Diego Biurrun [Sun, 30 Oct 2011 18:10:50 +0000 (19:10 +0100)]
misc Doxygen markup improvements

8 years agodoxygen: eliminate Qt-style doxygen syntax
Diego Biurrun [Sun, 30 Oct 2011 17:27:33 +0000 (18:27 +0100)]
doxygen: eliminate Qt-style doxygen syntax

8 years agog722: Add a regression test for muxing/demuxing in wav
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>
8 years agog722: Change bits per sample to 4
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>
8 years agog722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
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>
8 years agoffplay: Avoid directly accessing AVFrame fields that differ between forks.
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>
8 years agoffmpeg: Avoid directly accessing AVFrame fields that differ between forks.
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>
8 years agolavc: Add a AVClass for AVFrames.
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>
8 years agoav_opt: add av_opt_ptr() to return a pointer to a field of a object based on
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>
8 years agoffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.
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>
8 years agoapi-example: update to use avcodec_decode_audio4()
Justin Ruggles [Fri, 11 Nov 2011 20:44:41 +0000 (15:44 -0500)]
api-example: update to use avcodec_decode_audio4()

8 years agoavplay: use avcodec_decode_audio4()
Justin Ruggles [Wed, 12 Oct 2011 17:27:41 +0000 (13:27 -0400)]
avplay: use avcodec_decode_audio4()

8 years agoavplay: use a separate buffer for playing silence
Justin Ruggles [Tue, 11 Oct 2011 19:49:39 +0000 (15:49 -0400)]
avplay: use a separate buffer for playing silence

8 years agoavformat: use avcodec_decode_audio4() in avformat_find_stream_info()
Justin Ruggles [Wed, 2 Nov 2011 18:35:36 +0000 (14:35 -0400)]
avformat: use avcodec_decode_audio4() in avformat_find_stream_info()

8 years agoavconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
Justin Ruggles [Mon, 21 Nov 2011 22:41:49 +0000 (17:41 -0500)]
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()

8 years agomov: Allow empty stts atom.
Alex Converse [Sat, 3 Dec 2011 01:00:11 +0000 (17:00 -0800)]
mov: Allow empty stts atom.

Fixes regressions caused by 30c3d976

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agodoc: document preferred Doxygen syntax and make patcheck detect it
Diego Biurrun [Tue, 8 Nov 2011 14:01:47 +0000 (15:01 +0100)]
doc: document preferred Doxygen syntax and make patcheck detect it

8 years agoadpcmenc: cosmetics: pretty-printing
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>
8 years agoac3dec: cosmetics: pretty-printing
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>
8 years agoyuv4mpeg: cosmetics: pretty-printing
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>
8 years agolavfi: add life source
Stefano Sabatini [Sun, 26 Jun 2011 17:47:18 +0000 (19:47 +0200)]
lavfi: add life source

8 years agoaevalsrc: add duration option
Stefano Sabatini [Fri, 2 Dec 2011 14:33:15 +0000 (15:33 +0100)]
aevalsrc: add duration option

8 years agoshorten: remove dead initialization
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>
8 years agoMicrosoft Windows ICO demuxer
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>
8 years agoroqvideodec: set AVFrame reference before reget_buffer.
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>
8 years agobmp: fix some 1bit samples.
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>
8 years agolatmdec: add fate test for audio config change
Janne Grunau [Fri, 2 Dec 2011 23:21:06 +0000 (00:21 +0100)]
latmdec: add fate test for audio config change

8 years agodoc/filters.texi: Update drawtext docs so that the documented input width/height...
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>
8 years agovf_drawtext: support W/H parameters to reduce UI differences to qatar
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>
8 years agoffmpeg: select best pixel format for the encoder if no exact match.
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>
8 years agooma: PCM support
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>
8 years agooma: better format detection with small probe buffer
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>
8 years agooma: clearify ambiguous if condition
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>
8 years agovf_drawtext: cosmetics to reduce diff to qatar
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>
8 years agovf_drawtext: Add main_w/h to improve compatibility with the modified UI
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>
8 years agoh264: show when has_b_frames is being increased.
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agowavpack: Properly clip samples during lossy decode
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>
8 years agoCode clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
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>
8 years agoCleaned pixdesc.c file in libavutil
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>
8 years agozmbv.c: coding style clean-up.
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>
8 years agoxan.c: coding style clean-up.
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>
8 years agompegvideo.c: code cleanup - first 500 lines.
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>
8 years agoflvdec: Stop searching for streams once a audio & a video stream has been found
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>
8 years agoAdd forgotten %ifdef HAVE_AVX.
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>
8 years agoh264: fix frame reordering code.
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.

8 years agolavu/error: define AVERROR_BUG.
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>
8 years agoavutil: av_x_if_null: remove const for the return value.
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>
8 years agoffmpeg: use standard duration calculation code in the stream copy case.
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>
8 years agoBMP: Support BMP OS/2 v2 with RLE compression.
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.

8 years agoAllow last mov chunk to have an arbitrary number of samples.
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.

8 years agoSupport decoding right-to-left targa files.
Carl Eugen Hoyos [Sat, 3 Dec 2011 11:22:12 +0000 (12:22 +0100)]
Support decoding right-to-left targa files.

Fixes ticket #698.

8 years agoceltdec: adapt to avcodec_decode_audio4.
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.

8 years agooma: Fix out of array read.
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>
8 years agoid3v2: Fix null ptr crash in get_extra_meta_func()
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>
8 years agozmbv: fix 2 memleaks
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>
8 years agozmbv: Fix keyframe fault protextion.
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>
8 years agoaudeo_get_buffer: fix pkt_pos
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>
8 years agodeveloper.texi: Fix naming convention
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>
8 years agoiff: support ExtraHalfBrite (EHB) palette mode
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>
8 years agopictordec: decode 8bpp images when extra header marker is missing
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>
8 years agoSilence warnings when decoding QNAP Systems H264 codec.
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.

8 years agolavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
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().

8 years agog723_1dec: update to new API
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>
8 years agog729dec: update to the new API
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agofate: Add a test for the VBLE decoder
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>
8 years agodoc: break some long lines in developer.texi
Luca Barbato [Sat, 3 Dec 2011 00:18:28 +0000 (01:18 +0100)]
doc: break some long lines in developer.texi

8 years agodrawtext: make x and y parametric
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.

8 years agodrawtext: manage memory allocation better
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

8 years agodrawtext: refactor draw_text
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.

8 years agodoc: remove space between variable and post increment in example code
Janne Grunau [Sat, 3 Dec 2011 00:11:12 +0000 (01:11 +0100)]
doc: remove space between variable and post increment in example code

8 years agoswr-test: drop one const, silence most const qualifer warnings.
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>
8 years agoaac_latm: reconfigure decoder on audio specific config changes
Janne Grunau [Sat, 22 Oct 2011 20:04:00 +0000 (22:04 +0200)]
aac_latm: reconfigure decoder on audio specific config changes

8 years agolatmdec: fix audio specific config parsing
Janne Grunau [Fri, 21 Oct 2011 15:25:30 +0000 (17:25 +0200)]
latmdec: fix audio specific config parsing

Pass the correct size in bits to mpeg4audio_get_config and add a flag
to disable parsing of the sync extension when the size is not known.

Latm with AudioMuxVersion 0 does not specify the size of the audio
specific config. Data after the audio specific config can be
misinterpreted as sync extension resulting in random and wrong configs.

8 years agoswr-test_: Fix mixed declaration and statements:
Michael Niedermayer [Fri, 2 Dec 2011 23:40:15 +0000 (00:40 +0100)]
swr-test_: Fix mixed declaration and statements:

swresample_test.c:123:21: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
swresample_test.c:127:25: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavutil: increase struct SampleFmtInfo member 'name' length to 8
Giorgio Vazzana [Fri, 2 Dec 2011 23:10:56 +0000 (00:10 +0100)]
libavutil: increase struct SampleFmtInfo member 'name' length to 8

This is necessary since some sample format names are longer than 3 characters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Fix all cast qualifier warnings:
Michael Niedermayer [Fri, 2 Dec 2011 23:11:51 +0000 (00:11 +0100)]
swscale: Fix all cast qualifier warnings:

libswscale/swscale.c:2744:40: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/swscale.c:2745:41: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/swscale.c:2746:41: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/swscale.c:2747:78: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>