ffmpeg.git
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 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 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
7 years agompegvideo: don't pretend the first frame is always a key frame
Wolfram Gloger [Fri, 16 Mar 2012 20:17:00 +0000 (21:17 +0100)]
mpegvideo: don't pretend the first frame is always a key frame

Signed-off-by: Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
Modify the parser initialization so that parsers can
set pict_type themselves.  Use this in the mpegvideo parser
so that initial frames are not unconditionally I frames.
I have had this in my tree for several years.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: K&R formatting cosmetics
Diego Biurrun [Fri, 16 Mar 2012 17:40:05 +0000 (18:40 +0100)]
h264: K&R formatting cosmetics

Also remove some disabled code and fix a few comment typos.

7 years agos3tc.h: Add missing #include to fix standalone header compilation.
Diego Biurrun [Fri, 16 Mar 2012 17:50:15 +0000 (18:50 +0100)]
s3tc.h: Add missing #include to fix standalone header compilation.

7 years agosonic: update to new API
Michael Niedermayer [Fri, 16 Mar 2012 14:10:33 +0000 (15:10 +0100)]
sonic: update to new API

Fixes Ticket1075

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: Fix null pointer exception on corrupted input.
Michael Niedermayer [Fri, 16 Mar 2012 04:28:18 +0000 (05:28 +0100)]
matroskadec: Fix null pointer exception on corrupted input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoass: fix DAR calculation.
Michael Niedermayer [Fri, 16 Mar 2012 03:35:21 +0000 (04:35 +0100)]
ass: fix DAR calculation.

Found-by: REN Lifeng <renlifeng@wowfly.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 16 Mar 2012 00:36:49 +0000 (01:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxa: remove useless code
  lavf: don't select an attached picture as default stream for seeking.
  avconv: remove pointless checks.
  avconv: check for get_filtered_frame() failure.
  avconv: remove a pointless check.
  swscale: convert hscale() to use named arguments.
  x86inc: add *mp named argument support to DEFINE_ARGS.
  swscale: convert hscale to cpuflags().

Conflicts:
ffmpeg.c
libswscale/x86/scale.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohuffyuv: some more consts
Michael Niedermayer [Thu, 15 Mar 2012 21:17:36 +0000 (22:17 +0100)]
huffyuv: some more consts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: mark source of diff_bytes as const.
Michael Niedermayer [Thu, 15 Mar 2012 21:16:25 +0000 (22:16 +0100)]
dsputil: mark source of diff_bytes as const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodirac: mark some variables const.
Michael Niedermayer [Thu, 15 Mar 2012 21:12:02 +0000 (22:12 +0100)]
dirac: mark some variables const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: make mcdc() src const
Michael Niedermayer [Thu, 15 Mar 2012 21:07:54 +0000 (22:07 +0100)]
4xm: make mcdc() src const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFATE: add capability for audio encode/decode tests with fuzzy psnr comparison
Justin Ruggles [Sat, 10 Mar 2012 21:37:41 +0000 (16:37 -0500)]
FATE: add capability for audio encode/decode tests with fuzzy psnr comparison

This allows for testing floating-point audio encoders across different
platforms where exact comparisons are unreliable due to float rounding
differences.

7 years agompegvideo: fix constness error in ff_MPV_encode_picture()
Michael Niedermayer [Thu, 15 Mar 2012 21:04:21 +0000 (22:04 +0100)]
mpegvideo: fix constness error in ff_MPV_encode_picture()

The struct has some of its fields changed, thus is not strictly const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests/rotozoom: make some things const.
Michael Niedermayer [Thu, 15 Mar 2012 20:52:11 +0000 (21:52 +0100)]
tests/rotozoom: make some things const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFATE: allow a tolerance in the size comparison in do_tiny_psnr()
Justin Ruggles [Sun, 11 Mar 2012 00:52:05 +0000 (19:52 -0500)]
FATE: allow a tolerance in the size comparison in do_tiny_psnr()

This will allow for comparing decoded output to the original source when the
decoded size is not exactly the same as the original size.

7 years agoFATE: use absolute difference from a target value in do_tiny_psnr()
Justin Ruggles [Sun, 11 Mar 2012 00:33:34 +0000 (19:33 -0500)]
FATE: use absolute difference from a target value in do_tiny_psnr()

This will allow comparison to original pre-encoded content instead of
comparing to expected decoded output.

7 years agoFATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
Justin Ruggles [Sat, 10 Mar 2012 23:53:19 +0000 (18:53 -0500)]
FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr

This will allow adjusting for any encoder or decoder delay when doing
comparisons.

7 years agoFATE: use $fuzz directly in do_tiny_psnr() instead of passing it around
Justin Ruggles [Sat, 10 Mar 2012 23:50:45 +0000 (18:50 -0500)]
FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around

7 years agodxa: remove useless code
Paul B Mahol [Thu, 15 Mar 2012 01:36:45 +0000 (01:36 +0000)]
dxa: remove useless code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavf: don't select an attached picture as default stream for seeking.
Anton Khirnov [Thu, 15 Mar 2012 08:04:41 +0000 (09:04 +0100)]
lavf: don't select an attached picture as default stream for seeking.

7 years agoavconv: remove pointless checks.
Anton Khirnov [Wed, 14 Mar 2012 06:56:26 +0000 (07:56 +0100)]
avconv: remove pointless checks.

OutputStream.picref is guaranteed to be non-NULL if
get_filtered_video_frame() succeeds.

7 years agoavconv: check for get_filtered_frame() failure.
Anton Khirnov [Wed, 14 Mar 2012 06:55:27 +0000 (07:55 +0100)]
avconv: check for get_filtered_frame() failure.

7 years agoavconv: remove a pointless check.
Anton Khirnov [Wed, 14 Mar 2012 06:50:30 +0000 (07:50 +0100)]
avconv: remove a pointless check.

output_video_filter is always guaranteed to be set and is in fact
dereferenced right above the check.

7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 15 Mar 2012 07:26:41 +0000 (08:26 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: force video refresh if the window is resized or damaged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: convert hscale() to use named arguments.
Ronald S. Bultje [Tue, 13 Mar 2012 04:19:02 +0000 (21:19 -0700)]
swscale: convert hscale() to use named arguments.

7 years agox86inc: add *mp named argument support to DEFINE_ARGS.
Ronald S. Bultje [Mon, 12 Mar 2012 05:11:28 +0000 (22:11 -0700)]
x86inc: add *mp named argument support to DEFINE_ARGS.

7 years agoswscale: convert hscale to cpuflags().
Ronald S. Bultje [Mon, 12 Mar 2012 01:11:40 +0000 (18:11 -0700)]
swscale: convert hscale to cpuflags().

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 15 Mar 2012 00:21:16 +0000 (01:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: stricter reference limit enforcement.
  h264: increase reference poc list from 16 to 32.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  Add ffvhuff encoding and decoding regression test
  anm: convert to bytestream2 API
  bytestream: add more unchecked variants for bytestream2 API
  jvdec: unbreak video decoding
  jv demux: set video stream duration
  fate: add pam image regression test

Conflicts:
libavcodec/adpcm.c
libavcodec/anm.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/snowdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: force video refresh if the window is resized or damaged
Marton Balint [Mon, 31 Oct 2011 19:35:19 +0000 (20:35 +0100)]
ffplay: force video refresh if the window is resized or damaged

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agovf_fspp: add ff_ prefix to non static variables.
Michael Niedermayer [Wed, 14 Mar 2012 21:44:33 +0000 (22:44 +0100)]
vf_fspp: add ff_ prefix to non static variables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodocs: Add examples for -cpuflags
Michael Niedermayer [Wed, 7 Mar 2012 05:15:45 +0000 (06:15 +0100)]
docs: Add examples for -cpuflags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: Fix cpuflags so the flags dont pull in and out other flags.
Michael Niedermayer [Wed, 7 Mar 2012 05:16:02 +0000 (06:16 +0100)]
cmdutils: Fix cpuflags so the flags dont pull in and out other flags.

Note, this doesnt break compatibility with libav, as libav
has implemented a incompatible and more limited system under the same
-cpuflags command line option we used since some time.

The differences to libav for example are we can do things like
ffmpeg -cpuflags -sse+mmx -cpuflags +3dnow
Its also possible in our system to force flags that have not been
detected as available
And our -cpuflags works with all tools not just 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fspp: fix compilation with llvm
Baptiste Coudurier [Sat, 10 Mar 2012 01:54:01 +0000 (02:54 +0100)]
vf_fspp: fix compilation with llvm

7 years agomatroskaenc: change cluster_pos to use -1 as the "I'm not currently working on a...
Aaron Colwell [Wed, 14 Mar 2012 20:40:29 +0000 (21:40 +0100)]
matroskaenc: change cluster_pos to use -1 as the "I'm not currently working on a cluster" signal instead of 0.

This avoids problems
where avio_tell() returns 0. I've updated all the checks against
cluster_pos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: stricter reference limit enforcement.
Ronald S. Bultje [Tue, 13 Mar 2012 23:26:44 +0000 (16:26 -0700)]
h264: stricter reference limit enforcement.

Progressive images can have only 16 references, error out if there are
more, since the data is almost certainly corrupt, and the invalid value
will lead to random crashes or invalid writes later on.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoh264: increase reference poc list from 16 to 32.
Ronald S. Bultje [Tue, 13 Mar 2012 22:21:07 +0000 (15:21 -0700)]
h264: increase reference poc list from 16 to 32.

Interlaced images can have 32 references (16 per field), so limiting the
array size to 16 leads to invalid writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoxa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
Ronald S. Bultje [Tue, 13 Mar 2012 19:28:35 +0000 (12:28 -0700)]
xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agosnow: check reference frame indices.
Michael Niedermayer [Fri, 2 Mar 2012 19:53:00 +0000 (20:53 +0100)]
snow: check reference frame indices.

Fixes NULL ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agosnow: reject unsupported chroma shifts.
Michael Niedermayer [Fri, 9 Mar 2012 23:08:32 +0000 (00:08 +0100)]
snow: reject unsupported chroma shifts.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoAdd ffvhuff encoding and decoding regression test
Paul B Mahol [Wed, 14 Mar 2012 20:15:34 +0000 (20:15 +0000)]
Add ffvhuff encoding and decoding regression test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoanm: convert to bytestream2 API
Paul B Mahol [Tue, 13 Mar 2012 18:13:38 +0000 (18:13 +0000)]
anm: convert to bytestream2 API

Protects from overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agobytestream: add more unchecked variants for bytestream2 API
Paul B Mahol [Tue, 13 Mar 2012 14:14:59 +0000 (14:14 +0000)]
bytestream: add more unchecked variants for bytestream2 API

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agojvdec: unbreak video decoding
Paul B Mahol [Wed, 14 Mar 2012 03:02:02 +0000 (03:02 +0000)]
jvdec: unbreak video decoding

The safe bitstream reader broke it since the buffer size was specified
in bytes instead of bits.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
CC: libav-stable@libav.org
7 years agojv demux: set video stream duration
Paul B Mahol [Wed, 14 Mar 2012 03:14:01 +0000 (03:14 +0000)]
jv demux: set video stream duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agofate: add pam image regression test
Paul B Mahol [Wed, 14 Mar 2012 03:47:52 +0000 (03:47 +0000)]
fate: add pam image regression test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoffmpeg: Fix planar audio input.
Michael Niedermayer [Wed, 14 Mar 2012 05:12:38 +0000 (06:12 +0100)]
ffmpeg: Fix planar audio input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 14 Mar 2012 01:04:18 +0000 (02:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/general: update supported devices table.
  doc/general: add missing @tab to codecs table.
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  avconv: reindent
  avconv: link '-passlogfile' option to libx264 'stats' AVOption.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  http: Clear the auth state on redirects
  http: Retry auth if it failed due to being stale
  rtsp: Resend new keepalive commands if they used stale auth
  rtsp: Retry authentication if failed due to being stale
  httpauth: Parse the stale field in digest auth
  dxva2_vc1: pass the overlap flag to the decoder
  dxva2_vc1: fix decoding of BI frames
  FATE: add shorthand to wavpack test
  dfa: convert to bytestream2 API
  anm decoder: move buffer allocation from decode_init() to decode_frame()
  h264: improve parsing of broken AVC SPS

Conflicts:
ffmpeg.c
libavcodec/anm.c
libavcodec/dfa.c
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agommvideo: restore initial y value.
Michael Niedermayer [Tue, 13 Mar 2012 21:20:39 +0000 (22:20 +0100)]
mmvideo: restore initial y value.

This bug might have been exploitable (out of HEAP buffer writes)

Bug introduced by libav
commit a55d5bdc6e28a2cfefc440d792de5cc4f02377e2
Date:   Tue Mar 6 15:15:42 2012 -0800

    algmm: convert to bytestream2 API.

7 years agommvideo: remove unused variable
Michael Niedermayer [Tue, 13 Mar 2012 21:15:42 +0000 (22:15 +0100)]
mmvideo: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeglsdec: suppress unused var warning
Michael Niedermayer [Tue, 13 Mar 2012 21:13:13 +0000 (22:13 +0100)]
jpeglsdec: suppress unused var warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Fix some mixed declarations and code.
Michael Niedermayer [Tue, 13 Mar 2012 21:10:02 +0000 (22:10 +0100)]
h264: Fix some mixed declarations and code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeatgq: remove unused ret variable.
Michael Niedermayer [Tue, 13 Mar 2012 21:05:06 +0000 (22:05 +0100)]
eatgq: remove unused ret variable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeamad: Remove redundant initialization of mv_map.
Michael Niedermayer [Tue, 13 Mar 2012 21:04:25 +0000 (22:04 +0100)]
eamad: Remove redundant initialization of mv_map.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/general: update supported devices table.
Anton Khirnov [Tue, 13 Mar 2012 11:43:47 +0000 (12:43 +0100)]
doc/general: update supported devices table.

Add libcdio and fbdev, remove v4l1.

7 years agodoc/general: add missing @tab to codecs table.
Anton Khirnov [Tue, 13 Mar 2012 11:39:05 +0000 (12:39 +0100)]
doc/general: add missing @tab to codecs table.

7 years agog729dec: fix scalarproduct_int16 after API change
Michael Niedermayer [Tue, 13 Mar 2012 20:20:07 +0000 (21:20 +0100)]
g729dec: fix scalarproduct_int16 after API change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
Michael Niedermayer [Tue, 13 Mar 2012 01:26:50 +0000 (18:26 -0700)]
h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoavconv: reindent
Anton Khirnov [Mon, 12 Mar 2012 16:43:48 +0000 (17:43 +0100)]
avconv: reindent

CC: libav-stable@libav.org
7 years agoavconv: link '-passlogfile' option to libx264 'stats' AVOption.
Anton Khirnov [Mon, 12 Mar 2012 16:42:57 +0000 (17:42 +0100)]
avconv: link '-passlogfile' option to libx264 'stats' AVOption.

Fixes bug 204.

CC: libav-stable@libav.org
7 years agolibx264: add 'stats' private option for setting 2pass stats filename.
Anton Khirnov [Mon, 12 Mar 2012 16:20:20 +0000 (17:20 +0100)]
libx264: add 'stats' private option for setting 2pass stats filename.

x264 always opens the file itself with fopen, so we cannot use the
standard lavc stats mechanism.

CC: libav-stable@libav.org
7 years agolibx264: fix help text for slice-max-size option.
Anton Khirnov [Mon, 12 Mar 2012 16:09:22 +0000 (17:09 +0100)]
libx264: fix help text for slice-max-size option.

CC: libav-stable@libav.org
7 years agoiff: do not decode unsupported pbms with ham decoder
Peter Ross [Sun, 11 Mar 2012 23:32:11 +0000 (10:32 +1100)]
iff: do not decode unsupported pbms with ham decoder

This prevents the segfault reported by ticket #1054

7 years agohttp: Clear the auth state on redirects
Martin Storsjö [Mon, 12 Mar 2012 12:03:46 +0000 (14:03 +0200)]
http: Clear the auth state on redirects

Currently we only try continuing with the same auth mechanism
as the initial request.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Retry auth if it failed due to being stale
Martin Storsjö [Mon, 12 Mar 2012 12:00:16 +0000 (14:00 +0200)]
http: Retry auth if it failed due to being stale

Allow up to 4 retries for normal requests, where both the
proxy and the target server might need to authenticate.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortsp: Resend new keepalive commands if they used stale auth
Martin Storsjö [Mon, 12 Mar 2012 14:11:22 +0000 (16:11 +0200)]
rtsp: Resend new keepalive commands if they used stale auth

These commands are sent asynchronously, not waiting for the reply.
This reply is parsed later by ff_rtsp_tcp_read_packet or
udp_read_packet. If the reply indicates that we used stale
authentication and need to use a new nonce, resend a new keepalive
command immediately.

This is the only request sent asynchronously, so currently there's
no other command that needs to be resent in the same way.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortsp: Retry authentication if failed due to being stale
Martin Storsjö [Mon, 12 Mar 2012 11:59:53 +0000 (13:59 +0200)]
rtsp: Retry authentication if failed due to being stale

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttpauth: Parse the stale field in digest auth
Martin Storsjö [Mon, 12 Mar 2012 11:59:36 +0000 (13:59 +0200)]
httpauth: Parse the stale field in digest auth

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodxva2_vc1: pass the overlap flag to the decoder
Hendrik Leppkes [Fri, 20 Jan 2012 14:19:44 +0000 (15:19 +0100)]
dxva2_vc1: pass the overlap flag to the decoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodxva2_vc1: fix decoding of BI frames
Hendrik Leppkes [Fri, 20 Jan 2012 14:19:24 +0000 (15:19 +0100)]
dxva2_vc1: fix decoding of BI frames

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoFATE: add shorthand to wavpack test
Paul B Mahol [Tue, 13 Mar 2012 03:09:25 +0000 (03:09 +0000)]
FATE: add shorthand to wavpack test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agodfa: convert to bytestream2 API
Paul B Mahol [Tue, 13 Mar 2012 01:58:12 +0000 (01:58 +0000)]
dfa: convert to bytestream2 API

Protects from overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 13 Mar 2012 00:56:33 +0000 (01:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-mpeg: convert to bytestream2 API
  Revert "h264: clear trailing bits in partially parsed NAL units"
  remove iwmmxt optimizations
  mimic: do not continue if swap_buf_size is 0
  mimic: convert to bytestream2 API
  frwu: use MKTAG to check marker instead of AV_RL32
  txd: port to bytestream2 API
  c93: convert to bytestream2 API
  iff: make .long_name more descriptive
  FATE: add test for cdxl demuxer
  rtsp: Fix a typo

Conflicts:
libavcodec/arm/dsputil_iwmmxt.c
libavcodec/arm/dsputil_iwmmxt_rnd_template.c
libavcodec/arm/mpegvideo_iwmmxt.c
libavcodec/c93.c
libavcodec/txd.c
libavutil/arm/cpu.c
tests/fate/demux.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocosmetics: fix some typos
Lou Logan [Mon, 12 Mar 2012 22:30:13 +0000 (14:30 -0800)]
cosmetics: fix some typos

Patch attached.
From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001
From: Lou Logan <lou@lrcd.com>
Date: Mon, 12 Mar 2012 14:13:44 -0800
Subject: [PATCH] cosmetics: fix some typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: Fix vc1 decoding with --disable-optimizations.
Michael Niedermayer [Mon, 12 Mar 2012 23:05:03 +0000 (00:05 +0100)]
vc1dec: Fix vc1 decoding with --disable-optimizations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoanm decoder: move buffer allocation from decode_init() to decode_frame()
Peter Ross [Mon, 12 Mar 2012 23:42:53 +0000 (23:42 +0000)]
anm decoder: move buffer allocation from decode_init() to decode_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>