ffmpeg.git
6 years agoupdate for 1.1.1 n1.1.1
Michael Niedermayer [Sat, 19 Jan 2013 23:42:42 +0000 (00:42 +0100)]
update for 1.1.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoinit_get_bits: fix off by 1 error
Michael Niedermayer [Mon, 14 Jan 2013 15:29:27 +0000 (16:29 +0100)]
init_get_bits: fix off by 1 error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7980cca05c7c72fc8b0be4268eea2e156e538228)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoinit_get_bits8: zero pointers & struct on error
Michael Niedermayer [Mon, 14 Jan 2013 15:23:39 +0000 (16:23 +0100)]
init_get_bits8: zero pointers & struct on error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 153fad14e5a2f85637aa6c254ced0fc1c68974e2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoinit_get_bits8: check byte_size against being positive
Michael Niedermayer [Mon, 14 Jan 2013 15:22:41 +0000 (16:22 +0100)]
init_get_bits8: check byte_size against being positive

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ac73d3a12a33c5e4e6357d5f8824e19801663eb5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoThe c99-to-c89 binaries are now hosted on videolan.org.
Carl Eugen Hoyos [Mon, 14 Jan 2013 15:28:44 +0000 (16:28 +0100)]
The c99-to-c89 binaries are now hosted on videolan.org.
(cherry picked from commit c29c7c1470f98f8e66752fb09c44ded625e9a991)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/RELEASE_NOTES
Michael Niedermayer [Sat, 12 Jan 2013 17:39:54 +0000 (18:39 +0100)]
doc/RELEASE_NOTES

mention changed sample_fmt for audio decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec_decode_audio: do not trust the channel layout, use the channel count.
Michael Niedermayer [Fri, 18 Jan 2013 00:28:44 +0000 (01:28 +0100)]
avcodec_decode_audio: do not trust the channel layout, use the channel count.

Fixes memory corruption

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d270c3202539e8364c46410e15f7570800e33343)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoerror_concealment: Check that the picture is not in a half setup state.
Michael Niedermayer [Fri, 11 Jan 2013 03:44:20 +0000 (04:44 +0100)]
error_concealment: Check that the picture is not in a half setup state.

Fixes state becoming inconsistent
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 23318a57358358e7a4dc551e830e4503f0638cfe)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago012v: remove double ; and return correct error code if ff_get_buffer() fails
Paul B Mahol [Mon, 7 Jan 2013 10:48:02 +0000 (10:48 +0000)]
012v: remove double ; and return correct error code if ff_get_buffer() fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 25160236957647d81e8beecd6c8fb7f1949fc26e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/release/9' into release/1.1
Michael Niedermayer [Sat, 19 Jan 2013 14:21:40 +0000 (15:21 +0100)]
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()
  libcdio: support recent cdio-paranoia
  theora: Skip zero-sized headers
  h264: add 3 pixels below for subpixel filter wait position
  h264: fix ff_generate_sliding_window_mmcos() prototype.
  h264: don't clobber mmco opcode tables for non-first slice headers.

Conflicts:
configure
libavcodec/h264_refs.c
tests/ref/fate/filter-delogo
tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix opencv detection.
Jonas Bechtel [Sun, 13 Jan 2013 20:45:15 +0000 (21:45 +0100)]
Fix opencv detection.

This commit changes the ".so" argument placement in check_ld sub-program.
(cherry picked from commit a003c5bd4ff1846edba0518306f8091c14041c96)

6 years agoh264: fix () placement
Michael Niedermayer [Sun, 13 Jan 2013 22:44:01 +0000 (23:44 +0100)]
h264: fix () placement

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c13e4e288c84ba0629ead15e1460c0e498ee2bce)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:51 +0000 (00:07 +0100)]
rtmpproto: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a601eb9543ecab09aa69a6673e553318daf7ea57)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/mux: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:26 +0000 (00:07 +0100)]
lavf/mux: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1ac5a8d7e3343718b0e86b44013742b7ca413c38)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovsrc_testsrc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:02 +0000 (00:07 +0100)]
vsrc_testsrc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6f88d2d786b87cbfec5ea16d1cb570ad30c80399)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiff: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:06:44 +0000 (00:06 +0100)]
tiff: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 659546b42d6550e67fcdbb4937cd1982c60448aa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosvq1enc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:06:07 +0000 (00:06 +0100)]
svq1enc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 37be1d802f2e2c21036a54bb15423a41d5aabefb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agora144enc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:05:42 +0000 (00:05 +0100)]
ra144enc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e2704381e5f13f54506f69b7a05a05dc27ce1d7d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonellymoserenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:05:30 +0000 (00:05 +0100)]
nellymoserenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 795d2dc23b16a678d60a681e906aa87c14478597)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvorbisenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:59 +0000 (00:04 +0100)]
libvorbisenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bdd71abe5f34ca37612e17d912060f4dc9b94796)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvo-aacenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:41 +0000 (00:04 +0100)]
libvo-aacenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0ccb31dcad5a1543fbb284d66b0410b91ebd171d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibspeexenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:25 +0000 (00:04 +0100)]
libspeexenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3b8d66d5317d91288751869206b3acbb84dc44c7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibopencore-amr: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:13 +0000 (00:04 +0100)]
libopencore-amr: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6180aa29741334cf69f691b27ffceb33f49d36a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibmp3lame: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:03:38 +0000 (00:03 +0100)]
libmp3lame: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 871b6ec01d27a74702b7cf1d61446709de037948)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibfdk-aacenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:03:23 +0000 (00:03 +0100)]
libfdk-aacenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9302ad1ac89d5443505cf0418f9d62786513032e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibfaac: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:03:09 +0000 (00:03 +0100)]
libfaac: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68a25c64cda16e12ef3a051ff8661c71ef574683)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:02:50 +0000 (00:02 +0100)]
aacenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 98fed59427cec17ce55ac137e7e250cff7db81cf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples: fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:01:40 +0000 (00:01 +0100)]
doc/examples: fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 48a7981e6f93a27c9caca99d0bfb39e6244606a5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: fix handling of timestamps that cause multiple drops or silence injections
Michael Niedermayer [Sun, 13 Jan 2013 17:39:06 +0000 (18:39 +0100)]
swr: fix handling of timestamps that cause multiple drops or silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d676598f879ba01ddb62f9abe8e17b2e94cb91cd)

6 years agompeg12enc: check dimension validity
Michael Niedermayer [Mon, 7 Jan 2013 14:47:21 +0000 (15:47 +0100)]
mpeg12enc: check dimension validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12enc: Correctly mask dimensions
Michael Niedermayer [Mon, 7 Jan 2013 14:31:58 +0000 (15:31 +0100)]
mpeg12enc: Correctly mask dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12: Support decoding dimensions that are a multiple of 4096
Michael Niedermayer [Mon, 7 Jan 2013 14:31:00 +0000 (15:31 +0100)]
mpeg12: Support decoding dimensions that are a multiple of 4096

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: update ref after rv30_loop_filter fix
Luca Barbato [Thu, 17 Jan 2013 22:06:46 +0000 (23:06 +0100)]
fate: update ref after rv30_loop_filter fix

(cherry picked from commit 56ef1ef1f7580f41d6819ac63081a02f52752903)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agorv30: fix masking in rv30_loop_filter()
Xi Wang [Thu, 17 Jan 2013 06:24:15 +0000 (01:24 -0500)]
rv30: fix masking in rv30_loop_filter()

The mask `x && (1 << y)' is incorrect and always yields true.

The correct form should be `x & (1 << y)'.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
(cherry picked from commit 783e37f7ef3b3cdcfe7aa927a25b4184ae46cd53)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibcdio: support recent cdio-paranoia
Luca Barbato [Thu, 17 Jan 2013 10:24:01 +0000 (11:24 +0100)]
libcdio: support recent cdio-paranoia

Upstream decided to split the paranoia interface and move the headers
accordingly.
(cherry picked from commit 57224e425c567a87798b66425acc383c6dd37331)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agotheora: Skip zero-sized headers
Martin Storsjö [Thu, 17 Jan 2013 14:03:36 +0000 (16:03 +0200)]
theora: Skip zero-sized headers

This fixes a regression since d9cf5f51/7a2ee770f5 with theora
over RTP (possibly with other variants of theora as well).

In theora over RTP, the second of the 3 headers turns out to be
0 bytes long, which prior to d9cf5f51 worked just fine. After
d9cf5f51, reading from the bitstream reader fails (since the reader
wasn't initialized but returned an error if initialized with 0 bits).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e33db35b4a91ad543d9dde3a981a89118ba68937)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoOnly skip MLP header in mpeg files if the codec actually is MLP.
Carl Eugen Hoyos [Thu, 17 Jan 2013 16:19:08 +0000 (17:19 +0100)]
Only skip MLP header in mpeg files if the codec actually is MLP.

Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar
(cherry picked from commit ad406f7e402977cb7dbc78ccb63e21c137f6699e)

6 years agoFix compilation with --disable-everything.
Carl Eugen Hoyos [Thu, 10 Jan 2013 09:04:46 +0000 (10:04 +0100)]
Fix compilation with --disable-everything.
(cherry picked from commit f023003ce610a8fd6377cf4a8e98002ac3117ef4)

6 years agooggparsevorbis: fix vorbis_cleanup return type
Michael Niedermayer [Mon, 7 Jan 2013 13:14:41 +0000 (14:14 +0100)]
oggparsevorbis: fix vorbis_cleanup return type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/release/9' into release/1.1
Michael Niedermayer [Thu, 17 Jan 2013 02:37:48 +0000 (03:37 +0100)]
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  libx264: use the library specific default rc_initial_buffer_occupancy
  lavc: set the default rc_initial_buffer_occupancy
  lavc: introduce the convenience function init_get_bits8
  lavc: check for overflow in init_get_bits
  APIchanges: Fill in missing hashes and dates; fix a version number typo.
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free
  vp3: Fix double free in vp3_decode_end()
  update Changelog
  oggdec: make sure the private parse data is cleaned up
  oggdec: free the ogg streams on read_header failure
  update Changelog
  x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
  Prepare 9.1 Release

Conflicts:
Changelog
RELEASE
doc/APIchanges
libavcodec/utils.c
libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix detection of struct v4l2_frmsize_discrete.
Carl Eugen Hoyos [Thu, 17 Jan 2013 01:11:12 +0000 (02:11 +0100)]
Fix detection of struct v4l2_frmsize_discrete.

It was always detected successfully.
(cherry picked from commit c345100efc9baae0ea7c9fcc376725cae5d3df6e)

6 years agoh264: add 3 pixels below for subpixel filter wait position
Ronald S. Bultje [Tue, 15 Jan 2013 16:38:54 +0000 (08:38 -0800)]
h264: add 3 pixels below for subpixel filter wait position

If the motion vector is at a subpixel position, we need 3 pixels below
the motion vector's wholepel position available, not 2, since the MC
filter is a sixtap filter for the hpel position, and then a bilin filter
for the qpel position.

This patch fixes highly irreproducible (0.1%) fate failures in frame 2
and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field,
last line of MB x=40,y=2 and second field and last lines of MBs x=39-40,
y=3). These used pre-loopfilter instead of post-loopfilter data because
the await_progress() waited for one line too little in that field, and
the motion vector of these particular MBs happened to align exactly to a
position where that demonstrates the bug.

CC: libav-stable@libav.org
(cherry picked from commit fb845ffdd335a1efd6dfd43e8adeb530397b348e)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoh264: fix ff_generate_sliding_window_mmcos() prototype.
Anton Khirnov [Mon, 14 Jan 2013 19:07:53 +0000 (20:07 +0100)]
h264: fix ff_generate_sliding_window_mmcos() prototype.

It's been returning an error value since
bad446e251405dc250c3cbee199072e083a1e4b9

Also check for the errors it returns.
(cherry picked from commit ea382767ad2191acbe97e90624059723e15f0e4b)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoh264: don't clobber mmco opcode tables for non-first slice headers.
Ronald S. Bultje [Mon, 14 Jan 2013 05:46:44 +0000 (21:46 -0800)]
h264: don't clobber mmco opcode tables for non-first slice headers.

Clobbering these tables will temporarily clobber the template used
as a basis for other threads to start decoding from. If the other
decoding thread updates from the template right at that moment,
subsequent threads will get invalid (or, usually, none at all) mmco
tables. This leads to invalid reference lists and subsequent decode
failures.

Therefore, instead, decode the mmco tables only for the first slice in
a field or frame. For other slices, decode the bits and ensure they
are identical to the mmco tables in the first slice, but don't ever
clobber the context state. This prevents other threads from using a
clobbered/invalid template as starting point for decoding, and thus
fixes decoding in these cases.

This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with
frame-multithreading enabled.

(cherry picked from commit bad446e251405dc250c3cbee199072e083a1e4b9)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agooggdec: Leave treatment of serial changes to the decoder.
Michael Niedermayer [Sun, 13 Jan 2013 20:32:34 +0000 (21:32 +0100)]
oggdec: Leave treatment of serial changes to the decoder.

Attempting to re-parse the headers at demuxer level is a
pandora box the way its done currently.

This allows full reconfiguration of vorbis streams

Fixes Ticket2117
Fixes Ticket2121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c994bb2fb7727f5c20ef71cc6727fb219fd49d60)

6 years agovorbisdec: handle midstream parameter changes
Michael Niedermayer [Sun, 13 Jan 2013 20:31:17 +0000 (21:31 +0100)]
vorbisdec: handle midstream parameter changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e9ffee23f372390684d6d94bf8abf51350fc66a3)

6 years agovorbisdec: support freeing partially allocated contexts.
Michael Niedermayer [Sun, 13 Jan 2013 19:44:39 +0000 (20:44 +0100)]
vorbisdec: support freeing partially allocated contexts.

Fixes null pointer derefernces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 778069c8325514518712d194749577b3451b4125)

6 years agooggdec: resync from the last page.
Michael Niedermayer [Sun, 13 Jan 2013 20:23:11 +0000 (21:23 +0100)]
oggdec: resync from the last page.

Previously we re synced from where we where which cam lead
to loosing pages.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c5cf58d4b9b04cee1487a3095b83300791c21f15)

6 years agolibx264: use the library specific default rc_initial_buffer_occupancy
Luca Barbato [Mon, 14 Jan 2013 04:32:39 +0000 (05:32 +0100)]
libx264: use the library specific default rc_initial_buffer_occupancy

By default libav sets it to 3/4 while x264 sets it to 9/10.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 47812070a267cbdf74164e154d03d99bf8ced100)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavc: set the default rc_initial_buffer_occupancy
Luca Barbato [Mon, 14 Jan 2013 04:32:38 +0000 (05:32 +0100)]
lavc: set the default rc_initial_buffer_occupancy

rc_buffer_size is not set before.

Solve the initial the rate control underflow issue reported in
bug 222.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit bff3607547fdbb6e32b3830a351e6a33280c1e0d)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavc: introduce the convenience function init_get_bits8
Luca Barbato [Sun, 13 Jan 2013 22:37:11 +0000 (23:37 +0100)]
lavc: introduce the convenience function init_get_bits8

Accept the buffer size in bytes and check for overflow before passing
the value in bits to init_get_bits.
(cherry picked from commit e28ac6e5e27e64a206e399e958481c1e6f992189)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavc: check for overflow in init_get_bits
Luca Barbato [Sun, 13 Jan 2013 18:52:45 +0000 (19:52 +0100)]
lavc: check for overflow in init_get_bits

Fix an undefined behaviour and make the function return a proper
error in case of overflow.

CC: libav-stable@libav.org
(cherry picked from commit d9cf5f516974c64e01846ca685301014b38cf224)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoAPIchanges: Fill in missing hashes and dates; fix a version number typo.
Diego Biurrun [Sat, 12 Jan 2013 11:53:45 +0000 (12:53 +0100)]
APIchanges: Fill in missing hashes and dates; fix a version number typo.

6 years agolavfi/yadif: fix shorthand/option mismatch
André Pankratz [Thu, 10 Jan 2013 09:37:49 +0000 (10:37 +0100)]
lavfi/yadif: fix shorthand/option mismatch

Fix trac ticket #2128.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 0287eea914307a3fa03fa0d117af2955de0a4a2f)

6 years agoconfigure: enable pic for shared libs on AArch64
Marcin Juszkiewicz [Thu, 10 Jan 2013 12:22:53 +0000 (12:22 +0000)]
configure: enable pic for shared libs on AArch64

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d11cb13b0ef02fb1c303b29805819f6e1c9dc61b)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agozmbv: Reset the decoder on keyframe errors
Luca Barbato [Fri, 11 Jan 2013 04:07:42 +0000 (05:07 +0100)]
zmbv: Reset the decoder on keyframe errors

Prevent the crash on fuzzed files as reported in bug 63.
(cherry picked from commit c1d1ef4ecd9c4f1ca01c8149c7e57c14968ca588)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovc1dec: prevent a crash due missing pred_flag parameter
Vladimir Pantelic [Wed, 9 Jan 2013 16:04:09 +0000 (17:04 +0100)]
vc1dec: prevent a crash due missing pred_flag parameter

Handle pred_flag parameter not given to get_mvdata_interlaced()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 7b8c5b263bc680eff5710bee5994de39d47fc15e)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomatroska: Fix use after free
Dale Curtis [Thu, 10 Jan 2013 19:05:29 +0000 (11:05 -0800)]
matroska: Fix use after free

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ae3d41636942cbc0236bad21ad06c65f4eb0f096)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovp3: Fix double free in vp3_decode_end()
Ronald Bultje [Thu, 10 Jan 2013 19:02:57 +0000 (11:02 -0800)]
vp3: Fix double free in vp3_decode_end()

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ec86ba57312745fd7ad9771e3121e79c6aacba30)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodirac: fix inverted check
Michael Niedermayer [Tue, 8 Jan 2013 23:43:31 +0000 (00:43 +0100)]
dirac: fix inverted check

Regression since: ea6da80
Fixes Ticket2123

I cannot reproduce any regressions by flipping the wrong condition
to how it should have been.

Thanks-to: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 57bdd67646cfffa2921a8b28bb5f88cfe5c0989e)

6 years agolavf/mux: do not pass a copy of the packet to write_packet().
Clément Bœsch [Tue, 8 Jan 2013 21:39:25 +0000 (22:39 +0100)]
lavf/mux: do not pass a copy of the packet to write_packet().

Sometimes the muxer modifies the packet, like for instance lavf/mp3enc
changing pkt->destruct in order to keep a copy. These changes must be
kept, even though the muxer behaviour is questionable. Regression since
0072116.

Fixes #2124.
(cherry picked from commit 119d70db5099f9513d954283245efd7f699ad321)

6 years agoAdd forgotten AVC Intra entry to Changelog.
Carl Eugen Hoyos [Tue, 8 Jan 2013 00:08:36 +0000 (01:08 +0100)]
Add forgotten AVC Intra entry to Changelog.
(cherry picked from commit b23aff6755ff96b3b338e4b5f9eb3b6a91fda433)

6 years agoChangelog: move Megalux where it belongs
Paul B Mahol [Mon, 7 Jan 2013 09:44:48 +0000 (09:44 +0000)]
Changelog: move Megalux where it belongs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit e13c5abbd70440a02e00d7392738a36356481a78)

6 years agoupdate Changelog
Reinhard Tartler [Sun, 6 Jan 2013 17:04:10 +0000 (18:04 +0100)]
update Changelog

6 years agooggdec: make sure the private parse data is cleaned up
Luca Barbato [Fri, 4 Jan 2013 15:05:51 +0000 (16:05 +0100)]
oggdec: make sure the private parse data is cleaned up

(cherry picked from commit d894f74762bc95310ba23f804b7ba8dffc8f6646)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agooggdec: free the ogg streams on read_header failure
Luca Barbato [Fri, 4 Jan 2013 14:44:02 +0000 (15:44 +0100)]
oggdec: free the ogg streams on read_header failure

Plug an annoying memory leak on broken files.
(cherry picked from commit 89b51b570daa80e6e3790fcd449fe61fc5574e07)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoupdate for 1.1 n1.1
Michael Niedermayer [Sun, 6 Jan 2013 20:54:19 +0000 (21:54 +0100)]
update for 1.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add 1.1, remove 0.10
Michael Niedermayer [Sun, 6 Jan 2013 20:40:20 +0000 (21:40 +0100)]
MAINTAINERS: add 1.1, remove 0.10

If someone else wants to maintain a old release, please contact us

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRELEASE: 1.1.git for master
Michael Niedermayer [Sun, 6 Jan 2013 20:35:09 +0000 (21:35 +0100)]
RELEASE: 1.1.git for master

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog, update for 1.1 release
Michael Niedermayer [Sun, 6 Jan 2013 20:28:15 +0000 (21:28 +0100)]
Changelog, update for 1.1 release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_get_audio_frame_size: try to fix wma in wav
Michael Niedermayer [Sun, 6 Jan 2013 18:15:16 +0000 (19:15 +0100)]
ff_get_audio_frame_size: try to fix wma in wav

Fixes Ticket1905, Ticket2114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate/avfilter.mak: merge pp tests into GPL test list
Stefano Sabatini [Sun, 6 Jan 2013 17:40:50 +0000 (18:40 +0100)]
tests/fate/avfilter.mak: merge pp tests into GPL test list

The mp=pp filter was removed and replaced with a native implementation,
so the dependency on CONFIG_MP_FILTER stands no more.

6 years agolavfi/kerndeint: remove unused pixel_step.
Clément Bœsch [Sun, 6 Jan 2013 17:54:58 +0000 (18:54 +0100)]
lavfi/kerndeint: remove unused pixel_step.

6 years agolavfi/kerndeint: fix temp buffer linesize.
Clément Bœsch [Sun, 6 Jan 2013 06:23:43 +0000 (07:23 +0100)]
lavfi/kerndeint: fix temp buffer linesize.

Also re-enable the FATE test.

6 years agoSupport decoding AC-3 in wav.
Carl Eugen Hoyos [Sun, 6 Jan 2013 17:48:51 +0000 (18:48 +0100)]
Support decoding AC-3 in wav.

All known samples are actually ac3-in-spdif-in-wav, so use
the spdif demuxer to get the ac3 frames.

6 years agoupdate Changelog
Reinhard Tartler [Sun, 6 Jan 2013 17:04:10 +0000 (18:04 +0100)]
update Changelog

6 years ago012v decoder.
Carl Eugen Hoyos [Sun, 6 Jan 2013 16:55:14 +0000 (17:55 +0100)]
012v decoder.

The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.

6 years agoadd note on windows pipe
rogerdpack [Wed, 26 Dec 2012 19:21:15 +0000 (12:21 -0700)]
add note on windows pipe

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/ffmpeg-resampler: Try to document async
Michael Niedermayer [Sun, 6 Jan 2013 16:05:45 +0000 (17:05 +0100)]
doc/ffmpeg-resampler: Try to document async

Improvements welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport stereo as experimental feature in mmf / Yamaha SMAF.
Carl Eugen Hoyos [Sun, 6 Jan 2013 15:38:24 +0000 (16:38 +0100)]
Support stereo as experimental feature in mmf / Yamaha SMAF.

Fixes ticket #1085.

6 years agox86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
Justin Ruggles [Wed, 2 Jan 2013 18:34:48 +0000 (13:34 -0500)]
x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions

CC:libav-stable@libav.org
(cherry picked from commit 95d01c3f1c33c079db04e24133ba4a6b00d62d4a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoPrepare 9.1 Release
Reinhard Tartler [Sun, 6 Jan 2013 14:45:51 +0000 (15:45 +0100)]
Prepare 9.1 Release

6 years agofate: disable kerndeint test
Michael Niedermayer [Sun, 6 Jan 2013 14:07:19 +0000 (15:07 +0100)]
fate: disable kerndeint test

The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfenc: avoid depending on private codec structures and functions
Michael Niedermayer [Fri, 4 Jan 2013 20:18:57 +0000 (21:18 +0100)]
mxfenc: avoid depending on private codec structures and functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhd: Add avpriv_dnxhd_get_frame_size()
Michael Niedermayer [Fri, 4 Jan 2013 20:18:21 +0000 (21:18 +0100)]
dnxhd: Add avpriv_dnxhd_get_frame_size()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocos_tablegen: fix the lack on M_PI
Michael Niedermayer [Sat, 5 Jan 2013 13:09:33 +0000 (14:09 +0100)]
cos_tablegen: fix the lack on M_PI

We dont include mathematics.h as the headers get configured by config.h
for the target not the host.

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.
Thilo Borgmann [Sat, 5 Jan 2013 14:29:13 +0000 (15:29 +0100)]
alsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.

Reveiwed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalsdec: Consistently use a period at the end of error messages.
Thilo Borgmann [Sun, 6 Jan 2013 11:14:53 +0000 (12:14 +0100)]
alsdec: Consistently use a period at the end of error messages.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 6 Jan 2013 12:20:14 +0000 (13:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofrmdec: reduce probe score to reflect test accuracy (and pass probetest)
Peter Ross [Sun, 6 Jan 2013 05:51:22 +0000 (16:51 +1100)]
frmdec: reduce probe score to reflect test accuracy (and pass probetest)

6 years agovf_tinterlace: fix logical/bit op mixup
Michael Niedermayer [Sun, 6 Jan 2013 03:12:20 +0000 (04:12 +0100)]
vf_tinterlace: fix logical/bit op mixup

Fixes CID966642

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/kerndeint: get pix format description only once.
Clément Bœsch [Sun, 6 Jan 2013 03:36:42 +0000 (04:36 +0100)]
lavfi/kerndeint: get pix format description only once.

This makes the code faster.

6 years agofate: kerndeint requires gpl
Peter Ross [Sun, 6 Jan 2013 02:01:35 +0000 (13:01 +1100)]
fate: kerndeint requires gpl

6 years agolavfi/avfilter: remove now unused {src,cur,out}_buf.
Clément Bœsch [Sun, 6 Jan 2013 03:14:53 +0000 (04:14 +0100)]
lavfi/avfilter: remove now unused {src,cur,out}_buf.

This was supposed to be removed in 565e4993, but it was delayed due to
the port of the remaining filters. These buffer ref pointers are not
used anymore, thus dropped.

6 years agolavc/subviewerdec: fix potential NULL deref.
Clément Bœsch [Sun, 6 Jan 2013 03:01:11 +0000 (04:01 +0100)]
lavc/subviewerdec: fix potential NULL deref.

Fixes CID966647

6 years agoMegalux Frame demuxer
Peter Ross [Sun, 6 Jan 2013 02:58:15 +0000 (13:58 +1100)]
Megalux Frame demuxer

6 years agofate: disable lavfi-histeq
Michael Niedermayer [Sun, 6 Jan 2013 01:29:51 +0000 (02:29 +0100)]
fate: disable lavfi-histeq

The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_kerndeint: memset buffer to avoid use of uninitialized memory.
Michael Niedermayer [Sun, 6 Jan 2013 01:27:22 +0000 (02:27 +0100)]
vf_kerndeint: memset buffer to avoid use of uninitialized memory.

This might fix fate failures.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiffdec: Use the correct height field.
Piotr Bandurski [Sun, 6 Jan 2013 00:56:23 +0000 (01:56 +0100)]
tiffdec: Use the correct height field.

Fixes Ticket913

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago10l: Update fate seeking reference after last commit.
Carl Eugen Hoyos [Sat, 5 Jan 2013 22:42:00 +0000 (23:42 +0100)]
10l: Update fate seeking reference after last commit.