ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 19 Mar 2012 22:40:03 +0000 (23:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (35 commits)
  fix space type in Changelog
  ZeroCodec Decoder
  RealAudio Lossless decoder
  rtpenc: Use AVFormatContext.packet_size instead of a private option
  url: Document the expected behaviour of url_read
  libavformat: Use AVFormatContext.probesize in init_input
  docs: Fix a stray reference to tags in the generic doxy on dicts
  cosmetics: Align some AVInput/OutputFormat declarations
  zmbv: check decompress result
  zmbv: correct indentation
  adpcm: convert adpcm_thp to bytestream2.
  adpcm: convert adpcm_yamaha to bytestream2.
  adpcm: convert adpcm_swf to bytestream2.
  adpcm: convert adpcm_sbpro to bytestream2.
  adpcm: convert adpcm_ct to bytestream2.
  adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
  adpcm: convert adpcm_ea_xas to bytestream2.
  adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
  adpcm: convert ea_maxis_xa to bytestream2.
  adpcm: convert adpcm_ea to bytestream2.
  ...

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/adpcm.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/zerocodec.c
libavcodec/zmbv.c
libavformat/riff.c
libavformat/url.h
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: move runs from stack to heap.
Michael Niedermayer [Mon, 19 Mar 2012 21:37:06 +0000 (22:37 +0100)]
snowenc: move runs from stack to heap.

Fixes ticket1082

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec_encode_audio2: Increase the audio buffer size.
Michael Niedermayer [Mon, 19 Mar 2012 21:20:04 +0000 (22:20 +0100)]
avcodec_encode_audio2: Increase the audio buffer size.

Fixes Ticket1104

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3_probe: consider id3 tags to be low scoring mp3.
Michael Niedermayer [Mon, 19 Mar 2012 19:41:34 +0000 (20:41 +0100)]
mp3_probe: consider id3 tags to be low scoring mp3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/aspect: fail with AVERROR(EINVAL) in case of invalid specified aspect
Stefano Sabatini [Mon, 19 Mar 2012 19:06:06 +0000 (20:06 +0100)]
lavfi/aspect: fail with AVERROR(EINVAL) in case of invalid specified aspect

Previously it was returning 0 in case the aspect was parsable but
invalid.

X-ColaCount: +10*PHIl

7 years agofix space type in Changelog
Kostya Shishkov [Mon, 19 Mar 2012 18:11:24 +0000 (19:11 +0100)]
fix space type in Changelog

7 years agoZeroCodec Decoder
Derek Buitenhuis [Sun, 18 Mar 2012 19:04:38 +0000 (15:04 -0400)]
ZeroCodec Decoder

An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agolavc/sunrastenc: consider cases with linesize < 0
Stefano Sabatini [Sun, 18 Mar 2012 15:55:53 +0000 (16:55 +0100)]
lavc/sunrastenc: consider cases with linesize < 0

Make sunrast_image_write_image() deal with cases when linesize is < 0.
Fix trac ticket #1077.

7 years agoRealAudio Lossless decoder
Kostya Shishkov [Sat, 17 Mar 2012 07:48:57 +0000 (08:48 +0100)]
RealAudio Lossless decoder

7 years agortpenc: Use AVFormatContext.packet_size instead of a private option
Martin Storsjö [Mon, 19 Mar 2012 11:56:25 +0000 (13:56 +0200)]
rtpenc: Use AVFormatContext.packet_size instead of a private option

The private option has not been part of any release yet (and
it is only of use in quite rare cases), so just remove it instead
of keeping it with deprecation warnings.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agourl: Document the expected behaviour of url_read
Nicolas George [Thu, 15 Mar 2012 11:16:54 +0000 (12:16 +0100)]
url: Document the expected behaviour of url_read

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavformat: Use AVFormatContext.probesize in init_input
Martin Storsjö [Mon, 19 Mar 2012 12:24:04 +0000 (14:24 +0200)]
libavformat: Use AVFormatContext.probesize in init_input

This was forgotten in the transition from av_open_input_file to
avformat_open_input, see 603b8bc2a1.

This doesn't change anything for the default case where the
option isn't set, since PROBE_BUF_MAX is 1048576 (which was
used as max probe size earlier) while the default value for
the probesize option is 5000000, which for the probe function
is clipped to PROBE_BUF_MAX anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodocs: Fix a stray reference to tags in the generic doxy on dicts
Martin Storsjö [Mon, 19 Mar 2012 12:21:52 +0000 (14:21 +0200)]
docs: Fix a stray reference to tags in the generic doxy on dicts

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agogxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function
Matthieu Bouron [Sat, 17 Mar 2012 09:59:11 +0000 (10:59 +0100)]
gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocosmetics: Align some AVInput/OutputFormat declarations
Martin Storsjö [Mon, 19 Mar 2012 10:17:47 +0000 (12:17 +0200)]
cosmetics: Align some AVInput/OutputFormat declarations

Also add missing trailing commas.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoTell users about supported audio samplerates in mmf.
Carl Eugen Hoyos [Mon, 19 Mar 2012 09:09:04 +0000 (10:09 +0100)]
Tell users about supported audio samplerates in mmf.

7 years agoMatch documentation for transparency in BGR32 iff images.
Carl Eugen Hoyos [Mon, 19 Mar 2012 08:49:33 +0000 (09:49 +0100)]
Match documentation for transparency in BGR32 iff images.

7 years agozmbv: check decompress result
Kostya Shishkov [Sun, 18 Mar 2012 08:11:39 +0000 (09:11 +0100)]
zmbv: check decompress result

Changing flush type from Z_FINISH is needed since encoder compresses fixed
amount of data and doesn't care about writing end of stream marker.

7 years agozmbv: correct indentation
Kostya Shishkov [Sun, 18 Mar 2012 07:48:50 +0000 (08:48 +0100)]
zmbv: correct indentation

7 years agoh264: print the pps_id when its invalid.
Michael Niedermayer [Mon, 19 Mar 2012 00:43:44 +0000 (01:43 +0100)]
h264: print the pps_id when its invalid.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoZeroCodec Decoder
Derek Buitenhuis [Sun, 18 Mar 2012 17:00:18 +0000 (13:00 -0400)]
ZeroCodec Decoder

An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 18 Mar 2012 22:12:35 +0000 (23:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: make compare() function compatible with POSIX bc
  Update Janne's email address.
  APIchanges: Replace Subversion revision numbers by Git hashes.
  bytestream: Eliminate one level of pointless macro indirection.
  xwd: convert to bytestream2.
  vqavideo: port to bytestream2 API
  Read preset files with suffix .avpreset
  prores: allow user to set fixed quantiser
  lavf: remove some disabled code.
  lavf: only set average frame rate for video.
  lavf: remove a pointless check.
  avcodec: add XBM encoder

Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vqavideo.c
libavformat/img2enc.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcm: convert adpcm_thp to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:43:06 +0000 (15:43 -0700)]
adpcm: convert adpcm_thp to bytestream2.

7 years agoadpcm: convert adpcm_yamaha to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:39:16 +0000 (15:39 -0700)]
adpcm: convert adpcm_yamaha to bytestream2.

7 years agoadpcm: convert adpcm_swf to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:38:49 +0000 (15:38 -0700)]
adpcm: convert adpcm_swf to bytestream2.

7 years agoadpcm: convert adpcm_sbpro to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:38:10 +0000 (15:38 -0700)]
adpcm: convert adpcm_sbpro to bytestream2.

7 years agoadpcm: convert adpcm_ct to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:33:43 +0000 (15:33 -0700)]
adpcm: convert adpcm_ct to bytestream2.

7 years agoadpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:32:57 +0000 (15:32 -0700)]
adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.

7 years agoadpcm: convert adpcm_ea_xas to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:25:03 +0000 (15:25 -0700)]
adpcm: convert adpcm_ea_xas to bytestream2.

7 years agoadpcm: convert adpcm_ea_r1/2/3 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:07:03 +0000 (15:07 -0700)]
adpcm: convert adpcm_ea_r1/2/3 to bytestream2.

7 years agoadpcm: convert ea_maxis_xa to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:54:18 +0000 (14:54 -0700)]
adpcm: convert ea_maxis_xa to bytestream2.

7 years agoadpcm: convert adpcm_ea to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:43:20 +0000 (14:43 -0700)]
adpcm: convert adpcm_ea to bytestream2.

7 years agoadpcm convert adpcm_ima_ea_sead to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:35:26 +0000 (14:35 -0700)]
adpcm convert adpcm_ima_ea_sead to bytestream2.

7 years agoadpcm: convert adpcm_ima_ea_eacs to bytestream2.
Ronald S. Bultje [Sun, 18 Mar 2012 00:06:39 +0000 (17:06 -0700)]
adpcm: convert adpcm_ima_ea_eacs to bytestream2.

7 years agoadpcm: convert adpcm_xa to bytestream2.
Ronald S. Bultje [Sun, 18 Mar 2012 00:06:14 +0000 (17:06 -0700)]
adpcm: convert adpcm_xa to bytestream2.

7 years agoadpcm: convert ima_ws to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:17:48 +0000 (14:17 -0700)]
adpcm: convert ima_ws to bytestream2.

7 years agoadpcm: convert adpcm_ima_apc to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:07:20 +0000 (14:07 -0700)]
adpcm: convert adpcm_ima_apc to bytestream2.

7 years agoadpcm: convert adpcm_ima_iss to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:42:17 +0000 (13:42 -0700)]
adpcm: convert adpcm_ima_iss to bytestream2.

7 years agoadpcm: convert adpcm_dk3 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:39:54 +0000 (13:39 -0700)]
adpcm: convert adpcm_dk3 to bytestream2.

7 years agoadpcm: convert adpcm_dk4 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:10:19 +0000 (13:10 -0700)]
adpcm: convert adpcm_dk4 to bytestream2.

7 years agoadpcm: convert adpcm_ms to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:04:12 +0000 (13:04 -0700)]
adpcm: convert adpcm_ms to bytestream2.

7 years agoadpcm: use av_clip() in adpcm_ima_expand_nibble().
Ronald S. Bultje [Sat, 17 Mar 2012 19:58:03 +0000 (12:58 -0700)]
adpcm: use av_clip() in adpcm_ima_expand_nibble().

7 years agoadpcm: convert adpcm_4xm to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:55:07 +0000 (12:55 -0700)]
adpcm: convert adpcm_4xm to bytestream2.

7 years agoadpcm: convert adpcm_ima_wav to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:51:59 +0000 (12:51 -0700)]
adpcm: convert adpcm_ima_wav to bytestream2.

7 years agoadpcm: convert adpcm_ima_qt to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:45:09 +0000 (12:45 -0700)]
adpcm: convert adpcm_ima_qt to bytestream2.

7 years agoadpcm: fix nb_samples rounding for adpcm_ima_dk3, and update reference.
Ronald S. Bultje [Sun, 18 Mar 2012 20:36:32 +0000 (13:36 -0700)]
adpcm: fix nb_samples rounding for adpcm_ima_dk3, and update reference.

7 years agooma: Fix out of array read.
Michael Niedermayer [Sun, 18 Mar 2012 18:53:09 +0000 (14:53 -0400)]
oma: Fix out of array read.

Input: 01-Untitled-partial.oma
ZZUF params: zzuf[s=7157,r=0.001]

Fixes Bugzilla #106

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agobuild_sys: zmbv test depends on zlib
Michael Niedermayer [Sun, 18 Mar 2012 21:13:15 +0000 (22:13 +0100)]
build_sys: zmbv test depends on zlib

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild_sys: zlib_test depends on zlib
Michael Niedermayer [Sun, 18 Mar 2012 21:13:01 +0000 (22:13 +0100)]
build_sys: zlib_test depends on zlib

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild_sys: mpng_test depends on zlib
Michael Niedermayer [Sun, 18 Mar 2012 21:12:36 +0000 (22:12 +0100)]
build_sys: mpng_test depends on zlib

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild_sys: flashsv2_test depends on zlib
Michael Niedermayer [Sun, 18 Mar 2012 21:12:16 +0000 (22:12 +0100)]
build_sys: flashsv2_test depends on zlib

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild_sys: Add dependencies for pp testing.
Michael Niedermayer [Sun, 18 Mar 2012 20:48:51 +0000 (21:48 +0100)]
build_sys: Add dependencies for pp testing.

Should fix mp=pp test failure by not running it without --enable-gpl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/movie: add loop parameter
William Yu [Thu, 15 Mar 2012 11:45:26 +0000 (19:45 +0800)]
lavfi/movie: add loop parameter

Signed-off-by: William Yu <genwillyu@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavc/jpeglsenc: fix allocation in case of negative linesize, and add malloc check
Stefano Sabatini [Sun, 18 Mar 2012 15:42:32 +0000 (16:42 +0100)]
lavc/jpeglsenc: fix allocation in case of negative linesize, and add malloc check

Fix crash with negative linesizes, fix trac ticket #1078.

7 years agopgmyuvenc: abort encoding if width is not even
Paul B Mahol [Sun, 18 Mar 2012 18:04:44 +0000 (18:04 +0000)]
pgmyuvenc: abort encoding if width is not even

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Let pkt->pts = mxf->current_edit_unit if intra-only
Tomas Härdin [Wed, 7 Mar 2012 09:03:16 +0000 (10:03 +0100)]
mxfdec: Let pkt->pts = mxf->current_edit_unit if intra-only

We can't do this in general since we could be reading a file with B-frames while
lacking an index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: make compare() function compatible with POSIX bc
Mans Rullgard [Sun, 18 Mar 2012 17:44:18 +0000 (17:44 +0000)]
fate: make compare() function compatible with POSIX bc

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoUpdate Janne's email address.
Diego Biurrun [Wed, 22 Feb 2012 08:19:34 +0000 (09:19 +0100)]
Update Janne's email address.

7 years agoAPIchanges: Replace Subversion revision numbers by Git hashes.
Diego Biurrun [Wed, 7 Mar 2012 08:27:35 +0000 (09:27 +0100)]
APIchanges: Replace Subversion revision numbers by Git hashes.

7 years agobytestream: Eliminate one level of pointless macro indirection.
Diego Biurrun [Fri, 16 Mar 2012 17:41:29 +0000 (18:41 +0100)]
bytestream: Eliminate one level of pointless macro indirection.

7 years agoxwd: convert to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:24:11 +0000 (12:24 -0700)]
xwd: convert to bytestream2.

7 years agovqavideo: port to bytestream2 API
Paul B Mahol [Fri, 16 Mar 2012 00:56:41 +0000 (00:56 +0000)]
vqavideo: port to bytestream2 API

Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoindeo4: Skip null frames.
Michael Niedermayer [Sun, 18 Mar 2012 12:57:20 +0000 (13:57 +0100)]
indeo4: Skip null frames.

Fixes crashes from Ticket845

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpg: fix colors for sequential RGB
Carl Eugen Hoyos [Sun, 18 Mar 2012 12:08:08 +0000 (13:08 +0100)]
jpg: fix colors for sequential RGB

Fixes Ticket850

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovorbisenc: set quality to a reasonable default.
Michael Niedermayer [Sun, 18 Mar 2012 11:51:48 +0000 (12:51 +0100)]
vorbisenc: set quality to a reasonable default.

Fixed Ticket847

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/scale: document behavior with regards to the output sample aspect ratio
Stefano Sabatini [Sat, 17 Mar 2012 11:28:35 +0000 (12:28 +0100)]
lavfi/scale: document behavior with regards to the output sample aspect ratio

Also show the input and output sample aspect ratio in the log.

7 years agoRead preset files with suffix .avpreset
Reinhard Tartler [Sun, 18 Mar 2012 08:26:32 +0000 (09:26 +0100)]
Read preset files with suffix .avpreset

The preset files have been renamed some time ago.

CC: libav-stable@libav.org
7 years agoprores: allow user to set fixed quantiser
Kostya Shishkov [Sat, 17 Mar 2012 14:14:00 +0000 (15:14 +0100)]
prores: allow user to set fixed quantiser

7 years agodv: Fix streamcopy input.
Michael Niedermayer [Sun, 18 Mar 2012 01:57:25 +0000 (02:57 +0100)]
dv: Fix streamcopy input.

Fixes Ticket1042

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox11grab: fix compilation
Michael Niedermayer [Sun, 18 Mar 2012 00:09:40 +0000 (01:09 +0100)]
x11grab: fix compilation

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopthread: Fix mixing of declarations and statements.
Michael Niedermayer [Sat, 17 Mar 2012 22:49:56 +0000 (23:49 +0100)]
pthread: Fix mixing of declarations and statements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 17 Mar 2012 22:16:05 +0000 (23:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  resample: allocate a large enough output buffer
  fate: fix enc_dec_pcm tests with remote target
  wmaenc: remove bit-exact hack
  FATE: remove WMA acodec tests
  FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
  FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
  qtrle: Use bytestream2 functions to prevent buffer overreads.
  vqavideo: check malloc return values
  x11grab: fix a memory leak exposed by valgrind
  threads: fix old frames returned after avcodec_flush_buffers()
  MPV: always mark dummy frames as reference
  h264: fix deadlocks on incomplete reference frame decoding.
  mpeg4: report frame decoding completion at ff_MPV_frame_end().
  mimic: don't use self as reference, and report completion at end of decode().

Conflicts:
libavcodec/h264.c
libavcodec/qtrle.c
libavcodec/resample.c
libavcodec/vqavideo.c
libavdevice/x11grab.c
tests/ref/seek/wmav1_asf
tests/ref/seek/wmav2_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: remove some disabled code.
Anton Khirnov [Wed, 14 Mar 2012 06:25:24 +0000 (07:25 +0100)]
lavf: remove some disabled code.

7 years agolavf: only set average frame rate for video.
Anton Khirnov [Tue, 13 Mar 2012 20:45:05 +0000 (21:45 +0100)]
lavf: only set average frame rate for video.

7 years agolavf: remove a pointless check.
Anton Khirnov [Tue, 13 Mar 2012 16:52:08 +0000 (17:52 +0100)]
lavf: remove a pointless check.

Timebase is already checked in avpriv_set_pts_info().

7 years agodsp: fix diff_bytes_mmx() with small width
Michael Niedermayer [Sat, 17 Mar 2012 19:45:45 +0000 (20:45 +0100)]
dsp: fix diff_bytes_mmx() with small width

Fixes Ticket1068

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: add XBM encoder
Paul B Mahol [Sat, 17 Mar 2012 17:43:58 +0000 (17:43 +0000)]
avcodec: add XBM encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoresample: allocate a large enough output buffer
Justin Ruggles [Wed, 14 Mar 2012 17:01:32 +0000 (13:01 -0400)]
resample: allocate a large enough output buffer

Fixes invalid writes and crashes when doing conversions such as stereo to 5.1
channels or sample rate conversion on 5.1 channels.

7 years agofate: fix enc_dec_pcm tests with remote target
Mans Rullgard [Sat, 17 Mar 2012 16:22:47 +0000 (16:22 +0000)]
fate: fix enc_dec_pcm tests with remote target

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agovf_thumbnail: forward request_frame at least once.
Nicolas George [Sat, 10 Mar 2012 23:19:50 +0000 (00:19 +0100)]
vf_thumbnail: forward request_frame at least once.

The current version relied on poll_frame to request
the very first frame, that would not work if the
surrounding code does not call poll_frame.

7 years agowmaenc: remove bit-exact hack
Justin Ruggles [Sat, 17 Mar 2012 15:42:49 +0000 (11:42 -0400)]
wmaenc: remove bit-exact hack

It may have improved cross-platform stability, but wasn't the only place in
the encoder with bitexact issues. It is no longer needed because we have FATE
tests for float encoders using fuzzy comparison.

7 years agoFATE: remove WMA acodec tests
Justin Ruggles [Sat, 17 Mar 2012 15:35:18 +0000 (11:35 -0400)]
FATE: remove WMA acodec tests

7 years agoFATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
Justin Ruggles [Fri, 9 Mar 2012 02:53:39 +0000 (21:53 -0500)]
FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison

7 years agoFATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
Justin Ruggles [Sat, 10 Mar 2012 20:36:34 +0000 (15:36 -0500)]
FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison

7 years agoudp: fix non-blocking and interrupt handling.
Nicolas George [Thu, 15 Mar 2012 11:19:37 +0000 (12:19 +0100)]
udp: fix non-blocking and interrupt handling.

In non-blocking mode, lowest-level read protocols are
supposed block only for a short amount of time to let
retry_transfer_wrapper() check for interrupts.

Also, checking the interrupt_callback in the receiving thread is
wrong, as interrupt_callback is not guaranteed to be thread-safe
and the job is already done by retry_transfer_wrapper(). The error
code was also incorrect.

Bug reported by Andrey Utkin.

7 years agolavfi/crop: show input and output sample aspect ratio in the log
Stefano Sabatini [Sat, 17 Mar 2012 11:28:09 +0000 (12:28 +0100)]
lavfi/crop: show input and output sample aspect ratio in the log

7 years agourl: document url_read exact behaviour.
Nicolas George [Thu, 15 Mar 2012 11:16:54 +0000 (12:16 +0100)]
url: document url_read exact behaviour.

7 years agolavfi/allfilters: fix weird vertical align
Stefano Sabatini [Sat, 17 Mar 2012 10:33:34 +0000 (11:33 +0100)]
lavfi/allfilters: fix weird vertical align

7 years agolavfi: add bbox filter
Stefano Sabatini [Sun, 11 Mar 2012 02:05:42 +0000 (03:05 +0100)]
lavfi: add bbox filter

Also add bbox.h and bbox.c files, based on the remove-logo filter by
Robert Edele. These files are useful for sharing code with the pending
removelogo port.

7 years agopcm: leave sample format conversion to libswresample
Paul B Mahol [Sat, 17 Mar 2012 03:05:12 +0000 (03:05 +0000)]
pcm: leave sample format conversion to libswresample

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 17 Mar 2012 03:43:12 +0000 (04:43 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: K&R formatting cosmetics
  s3tc.h: Add missing #include to fix standalone header compilation.
  FATE: add capability for audio encode/decode tests with fuzzy psnr comparison
  FATE: allow a tolerance in the size comparison in do_tiny_psnr()
  FATE: use absolute difference from a target value in do_tiny_psnr()
  FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
  FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: allow selective and complete disabling of map_metadata.
Michael Niedermayer [Fri, 16 Mar 2012 03:07:59 +0000 (04:07 +0100)]
ffmpeg: allow selective and complete disabling of map_metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqtrle: Use bytestream2 functions to prevent buffer overreads.
Aneesh Dogra [Thu, 15 Mar 2012 19:13:23 +0000 (00:43 +0530)]
qtrle: Use bytestream2 functions to prevent buffer overreads.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agovqavideo: check malloc return values
Paul B Mahol [Fri, 16 Mar 2012 13:23:57 +0000 (13:23 +0000)]
vqavideo: check malloc return values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agox11grab: fix a memory leak exposed by valgrind
Antonio Ospite [Fri, 16 Mar 2012 21:23:34 +0000 (22:23 +0100)]
x11grab: fix a memory leak exposed by valgrind

When using "-f x11grab -i :0.0" valgrind reports a definitely lost
memory block with this message:

==31544== 5 bytes in 1 blocks are definitely lost in loss record 1 of 2
==31544==    at 0x4026E68: memalign (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==31544==    by 0x4026F17: posix_memalign (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==31544==    by 0x60D399A: av_malloc (in /usr/lib/x86_64-linux-gnu/libavutil.so.51.22.1)
==31544==    by 0x60D3A70: av_strdup (in /usr/lib/x86_64-linux-gnu/libavutil.so.51.22.1)
==31544==    by 0x4A2BE58: ??? (in /usr/lib/x86_64-linux-gnu/libavdevice.so.53.2.0)
==31544==    by 0x506D29E: avformat_open_input (in /usr/lib/x86_64-linux-gnu/libavformat.so.53.21.0)
==31544==    by 0x400A80: main (in /home/ao2/WIP/am7xxx-play/tests/a.out)

The 5 bytes lost are the ones from param = av_strdup(":0.0"), so let's
free param in the exit path.

Also check the av_strdup() return value.

Note: calling av_free(param) even when av_strdup() fails and param is
NULL is OK and keeps the code simpler without adding another label to
skip av_free().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agothreads: fix old frames returned after avcodec_flush_buffers()
Uoti Urpala [Fri, 16 Mar 2012 03:42:26 +0000 (05:42 +0200)]
threads: fix old frames returned after avcodec_flush_buffers()

Calling avcodec_flush_buffers() and then avcodec_decode_video2() with
a 0-sized packet (to get remaining buffered frames) could incorrectly
return an old frame from before the avcodec_flush_buffers() call. Add
a loop in ff_thread_flush() to zero the got_frame field of each thread
to ensure the old frames will not be returned.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoMPV: always mark dummy frames as reference
Janne Grunau [Fri, 16 Mar 2012 13:08:17 +0000 (14:08 +0100)]
MPV: always mark dummy frames as reference

If the dummy frame are not created from a reference frame they could
be deleted untimely resulting in multithreaded decoder waiting on
the current frame to finish.
Noticed by Ronald S. Bultje in the RV34 decoder with a broken file.

7 years agoh264: fix deadlocks on incomplete reference frame decoding.
Ronald S. Bultje [Fri, 16 Mar 2012 22:24:08 +0000 (15:24 -0700)]
h264: fix deadlocks on incomplete reference frame decoding.

If decoding a second complementary field, and the first was
decoded in our thread, mark decoding of that field as complete.
If decoding fails, mark the decoded field/frame as complete.
Do not allow switching between field modes or field/frame mode
between slices within the same field/frame. Ensure that two
subsequent fields cover top/bottom (rather than top/frame,
bottom/frame or such nonsense situations).

Fixes various deadlocks when decoding samples with errors in
reference frames.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agompeg4: report frame decoding completion at ff_MPV_frame_end().
Ronald S. Bultje [Fri, 16 Mar 2012 21:16:56 +0000 (14:16 -0700)]
mpeg4: report frame decoding completion at ff_MPV_frame_end().

Prevents hangs on corrupt input.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agomimic: don't use self as reference, and report completion at end of decode().
Ronald S. Bultje [Fri, 16 Mar 2012 21:04:00 +0000 (14:04 -0700)]
mimic: don't use self as reference, and report completion at end of decode().

Fixes hangs on corrupt samples that reference self-frames.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org