ffmpeg.git
5 years agox86/scale: fix xmm register count for hscale*_sse2 n2.2.5
James Almer [Mon, 9 Jun 2014 01:21:30 +0000 (22:21 -0300)]
x86/scale: fix xmm register count for hscale*_sse2

xmm6 was being clobbered in ff_hscale8to{15,19}_8_sse2 on Win64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 345f2234d1717d6128b2f90a7839c4906bf203ec)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoUpdate for FFmpeg 2.2.5
Michael Niedermayer [Tue, 15 Jul 2014 00:01:06 +0000 (02:01 +0200)]
Update for FFmpeg 2.2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Use av_stream_get_parser() to avoid ABI issues
Michael Niedermayer [Mon, 14 Jul 2014 19:06:58 +0000 (21:06 +0200)]
ffmpeg: Use av_stream_get_parser() to avoid ABI issues

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

Conflicts:

ffmpeg.c

5 years agoavformat: add av_stream_get_parser() to access avformat AVParser
Michael Niedermayer [Mon, 14 Jul 2014 19:03:43 +0000 (21:03 +0200)]
avformat: add av_stream_get_parser() to access avformat AVParser

The AVStream.parser field is considered private and its location cannot be
preserved while preserving also ABI compatibility to libav, as libav added fields
before it.
Some tools like ffmpeg.c access this field though

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

Conflicts:

RELEASE_NOTES
doc/APIchanges
libavformat/utils.c
libavformat/version.h

5 years agoavformat/utils: do not wait for packets from discarded streams for genpts
Michael Niedermayer [Sat, 12 Jul 2014 23:07:59 +0000 (01:07 +0200)]
avformat/utils: do not wait for packets from discarded streams for genpts

Fixes long loop
Fixes Ticket3208

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/f_ebur128: Use av_malloc_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:50:53 +0000 (03:50 +0200)]
avfilter/f_ebur128: Use av_malloc_array()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: Use av_malloc(z)_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:50:17 +0000 (03:50 +0200)]
avcodec/hevc: Use av_malloc(z)_array()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils_opencl: Use av_malloc_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:49:36 +0000 (03:49 +0200)]
cmdutils_opencl: Use av_malloc_array()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/x86/vf_pullup: fix old typo
Michael Niedermayer [Wed, 25 Jun 2014 16:10:12 +0000 (18:10 +0200)]
avfilter/x86/vf_pullup: fix old typo

This makes C and MMX match, no change to fate as the differences where
apparently not sufficient to show up in fate

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions
Michael Niedermayer [Wed, 25 Jun 2014 15:49:03 +0000 (17:49 +0200)]
avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions

This should avoid issues on x86_64

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:58:28 +0000 (22:58 +0200)]
Merge commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00' into release/2.2

* commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:57:48 +0000 (22:57 +0200)]
Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2

* commit '40dd29653ab85812d21fa64e9a665ceb316701ad':
  Prepare for 10.2 Release
  Update Changelog for v10.2

Conflicts:
Changelog
RELEASE

Not merged as these dont align with our releases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '564c023eba807b162527b17af40424de275fc795' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:48:15 +0000 (22:48 +0200)]
Merge commit '564c023eba807b162527b17af40424de275fc795' into release/2.2

* commit '564c023eba807b162527b17af40424de275fc795':
  adpcm: Write the proper predictor in trellis mode in IMA QT

See: fa8f060b75bf9074792a0f9ff4ed002652ef62b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '771564945aa9aebe2f30192b925fcf4909225eca' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:46:00 +0000 (22:46 +0200)]
Merge commit '771564945aa9aebe2f30192b925fcf4909225eca' into release/2.2

* commit '771564945aa9aebe2f30192b925fcf4909225eca':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

See: a32765c4252eb106a2ade543026ef6f59e699bfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '16f7cbef5610a878317596134607d2a89da66ecf' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:40:16 +0000 (22:40 +0200)]
Merge commit '16f7cbef5610a878317596134607d2a89da66ecf' into release/2.2

* commit '16f7cbef5610a878317596134607d2a89da66ecf':
  oggenc: Set the right AVOption size for the pref_duration option

See: 536baf6cc5d1db789c9f903776dccb7a41b62a6e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:39:25 +0000 (22:39 +0200)]
Merge commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92' into release/2.2

* commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92':
  avpacket: fix copying side data in av_packet_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:37:59 +0000 (22:37 +0200)]
Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2

* commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
libavcodec/jpeg2000.c

See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f
See: 912ce9dd2080c5837285a471d750fa311e09b555
See: 9e477a37703318cb86d8ed1d426929235aa02b67
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:26:06 +0000 (22:26 +0200)]
Merge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2

* commit '46c477c2a14b04a63ab11d31003b48fab6146a96':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:25:23 +0000 (22:25 +0200)]
Merge commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e' into release/2.2

* commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e':
  Check if an mp3 header is using a reserved sample rate.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2
Michael Niedermayer [Mon, 14 Jul 2014 20:23:26 +0000 (22:23 +0200)]
Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2

* commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21':
  lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

This is basically not merging changes due to this being fixed differently
in FFmpeg

See: d6af26c55c1ea30f85a7d9edbc373f53be1743ee
See: cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaf_compand: make sure request_frame always outputs at least one frame
Andrew Kelley [Sun, 6 Jul 2014 05:24:43 +0000 (22:24 -0700)]
af_compand: make sure request_frame always outputs at least one frame

This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit d3cfd7aff86ee3d449ca68aba21d67b9b2136a9b)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoPrepare for 10.2 Release
Reinhard Tartler [Fri, 27 Jun 2014 01:14:55 +0000 (21:14 -0400)]
Prepare for 10.2 Release

5 years agoUpdate Changelog for v10.2
Reinhard Tartler [Fri, 27 Jun 2014 01:11:20 +0000 (21:11 -0400)]
Update Changelog for v10.2

5 years agoadpcm: Write the proper predictor in trellis mode in IMA QT
Martin Storsjö [Thu, 5 Jun 2014 11:49:14 +0000 (14:49 +0300)]
adpcm: Write the proper predictor in trellis mode in IMA QT

The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.

This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b.

Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0776e0ef6ba4160281ef3fabea43e670f3792b4a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoadpcm: Avoid reading out of bounds in the IMA QT trellis encoder
Martin Storsjö [Thu, 5 Jun 2014 08:48:53 +0000 (11:48 +0300)]
adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

This was broken in 095be4fb - samples+ch (for the previous
non-planar case) equals &samples_p[ch][0]. The confusion
probably stemmed from the IMA WAV case where it originally
was &samples[avctx->channels + ch], which was correctly
changed into &samples_p[ch][1].

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 3d79d0c93e5b37a35b1b22d6c18699c233aad1ba)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agooggenc: Set the right AVOption size for the pref_duration option
Martin Storsjö [Fri, 6 Jun 2014 10:59:14 +0000 (13:59 +0300)]
oggenc: Set the right AVOption size for the pref_duration option

On big endian machines, the default value set via the faulty
AVOption ended up as 2^32 times too big.

This fixes the fate-lavf-ogg test which currently is broken on
big endian machines, broken since 3831362. Since that commit,
a final zero-sized packet is written to the ogg muxer in that test,
which caused different flushing behaviour on little and big endian
depending on whether the pref_duration option was handled as it
should or not.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 103243ca649cc305129ed0352bf4d97e5ddf4d80)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavpacket: fix copying side data in av_packet_copy_props()
Anton Khirnov [Sun, 18 May 2014 19:16:47 +0000 (21:16 +0200)]
avpacket: fix copying side data in av_packet_copy_props()

Side data count is incremented by by calling av_packet_new_side_data()
in the following loop, setting it explicitly results in the resulting
value being twice what it should be.

CC: libav-stable@libav.org
(cherry picked from commit cdf58f0599c39852ee3beafe5f64af7d57d4215b)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agojpeg2000: fix dereferencing invalid pointers during cleanup
Vittorio Giovara [Sun, 9 Mar 2014 17:52:40 +0000 (18:52 +0100)]
jpeg2000: fix dereferencing invalid pointers during cleanup

CC: libav-stable@libav.org
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoCheck mp3 header before calling avpriv_mpegaudio_decode_header().
Justin Ruggles [Sun, 22 Jun 2014 17:19:36 +0000 (13:19 -0400)]
Check mp3 header before calling avpriv_mpegaudio_decode_header().

As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.

CC:libav-stable@libav.org
(cherry picked from commit f2f2e7627f0c878d13275af5d166ec5932665e28)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoCheck if an mp3 header is using a reserved sample rate.
Justin Ruggles [Sun, 22 Jun 2014 17:11:32 +0000 (13:11 -0400)]
Check if an mp3 header is using a reserved sample rate.

Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.

Bug-Id: 705

CC:libav-stable@libav.org
(cherry picked from commit 44127546b0a81dc9dd6190739a62d48f0044c6f3)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolzo: Handle integer overflow
Luca Barbato [Thu, 19 Jun 2014 21:26:58 +0000 (23:26 +0200)]
lzo: Handle integer overflow

get_len can overflow for specially crafted payload.

Reported-By: Don A. Baley <donb@securitymouse.com>
CC: libav-stable@libav.org
(cherry picked from commit ccda51b14c0fcae2fad73a24872dce75a7964996)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoupdate for FFmpeg 2.2.4 n2.2.4
Michael Niedermayer [Mon, 23 Jun 2014 13:51:02 +0000 (15:51 +0200)]
update for FFmpeg 2.2.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpc: attempt to allocate a packet that is not smaller than the data inside it
Michael Niedermayer [Sat, 14 Jun 2014 22:49:02 +0000 (00:49 +0200)]
avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/cavsvideodec: Fix probing when the file extension is avs
Michael Niedermayer [Mon, 9 Jun 2014 03:17:34 +0000 (05:17 +0200)]
avformat/cavsvideodec: Fix probing when the file extension is avs

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocavsdec: fix qp fixed slice handling
Michael Niedermayer [Mon, 9 Jun 2014 03:47:49 +0000 (05:47 +0200)]
cavsdec: fix qp fixed slice handling

Fixes Ticket3400

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is...
Michael Niedermayer [Sun, 8 Jun 2014 12:30:30 +0000 (14:30 +0200)]
avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format...
Michael Niedermayer [Sat, 7 Jun 2014 10:03:31 +0000 (12:03 +0200)]
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.

Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 74760883fcb4443d105814ed246b3cf51d7e9dca)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aic: fix quantization table permutation
Michael Niedermayer [Thu, 5 Jun 2014 21:21:15 +0000 (23:21 +0200)]
avcodec/aic: fix quantization table permutation

Fixes Ticket3700

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lzo: add asserts to be double sure against overflows
Michael Niedermayer [Mon, 23 Jun 2014 12:45:47 +0000 (14:45 +0200)]
avutil/lzo: add asserts to be double sure against overflows

These asserts cannot fail since d6af26c55c1ea30f85a7d9edbc373f53be1743ee

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lzo: Fix integer overflow
Michael Niedermayer [Fri, 20 Jun 2014 01:15:28 +0000 (03:15 +0200)]
avutil/lzo: Fix integer overflow

Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)

Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb@securitymouse.com>
See: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6af26c55c1ea30f85a7d9edbc373f53be1743ee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoShow duration for large asf files as written in the file header.
Carl Eugen Hoyos [Sat, 21 Jun 2014 17:35:06 +0000 (19:35 +0200)]
Show duration for large asf files as written in the file header.

Fixes ticket #3428.
(cherry picked from commit e3fd263f0b73e4425192d6dd1ab18027ecaa35db)

5 years agoMerge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2
Michael Niedermayer [Thu, 19 Jun 2014 22:06:36 +0000 (00:06 +0200)]
Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2

* commit '6672f672d98cf4887e13321b6f67682cfd1273b4':
  avconv: make -shortest work with streamcopy

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3enc: drop redundant and uninitialized variable
Michael Niedermayer [Sun, 13 Apr 2014 18:03:24 +0000 (20:03 +0200)]
avformat/mp3enc: drop redundant and uninitialized variable

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: fix overwrite in ipred_vl_4x4_ssse3.
Ronald S. Bultje [Thu, 12 Jun 2014 01:09:54 +0000 (21:09 -0400)]
vp9/x86: fix overwrite in ipred_vl_4x4_ssse3.

Fixes track ticket 3717.

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

5 years agoavconv: make -shortest work with streamcopy
Anton Khirnov [Tue, 10 Jun 2014 15:41:57 +0000 (17:41 +0200)]
avconv: make -shortest work with streamcopy

CC: libav-stable@libav.org
(cherry picked from commit 48e50921337984ba4ec2c1cafe45d43787f84498)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoadpcm: Write the proper predictor in trellis mode in IMA QT
Martin Storsjö [Fri, 6 Jun 2014 09:03:09 +0000 (12:03 +0300)]
adpcm: Write the proper predictor in trellis mode in IMA QT

The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.

This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b.

Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.

Fixes part of Ticket3701

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

Conflicts:
tests/ref/acodec/adpcm-ima_qt-trellis

5 years agoadpcm: Fix trellis encoding of IMA QT
Martin Storsjö [Thu, 5 Jun 2014 08:56:10 +0000 (11:56 +0300)]
adpcm: Fix trellis encoding of IMA QT

This was broken in 095be4fb - samples+ch (for the previous
non-planar case) equals &samples_p[ch][0]. The confusion
probably stemmed from the IMA WAV case where it originally
was &samples[avctx->channels + ch], which was correctly
changed into &samples_p[ch][1].

Fixes part of Ticket3701

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

5 years agoavcodec/mjpegdec: Improve intel jpeg flip heuristic
Michael Niedermayer [Thu, 5 Jun 2014 23:32:22 +0000 (01:32 +0200)]
avcodec/mjpegdec: Improve intel jpeg flip heuristic

Fixes Ticket3698

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

5 years agoavcodec/h264: in the absence of recovery points, be more tolerant on accepting plain...
Michael Niedermayer [Wed, 4 Jun 2014 02:25:14 +0000 (04:25 +0200)]
avcodec/h264: in the absence of recovery points, be more tolerant on accepting plain I frames

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

5 years agoavcodec/utvideodec: Increase vlc len
Carl Eugen Hoyos [Thu, 29 May 2014 06:41:15 +0000 (08:41 +0200)]
avcodec/utvideodec: Increase vlc len

Fixes a regression since fb3e380 similar to ticket #2661,
reported by fluffrabbit at aol dot com.

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

5 years agoDo not limit blocksize when reading PCM from aiff.
Carl Eugen Hoyos [Mon, 2 Jun 2014 22:54:46 +0000 (00:54 +0200)]
Do not limit blocksize when reading PCM from aiff.

Fixes ticket #3695.
(cherry picked from commit 763e714442e07f6430b003c8a9f4b62deaa7b3a5)

5 years agoavformat/avidec: allow rounding errors between scale/rate and timebase
Michael Niedermayer [Wed, 4 Jun 2014 03:04:13 +0000 (05:04 +0200)]
avformat/avidec: allow rounding errors between scale/rate and timebase

Fixes Ticket3670

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

5 years agoffmpeg: prevent pts < dts to be passed through to the muxer on stream copy
Michael Niedermayer [Thu, 5 Jun 2014 16:37:32 +0000 (18:37 +0200)]
ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy

Fixes Ticket3658

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

5 years agoUpdate for 2.2.3 n2.2.3
Michael Niedermayer [Mon, 2 Jun 2014 21:08:27 +0000 (23:08 +0200)]
Update for 2.2.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec/h263_probe: Check TR
Michael Niedermayer [Wed, 7 May 2014 01:41:41 +0000 (03:41 +0200)]
avformat/h263dec/h263_probe: Check TR

Fixes missdetection of Misdetection_345.mp3
Fixes missdetection of Misdetection_421.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd20b93e2f5171054d6b3dd9daee1e832c1f9090)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec/h263_probe: Check PSC bit 9 and 13 in
Michael Niedermayer [Wed, 7 May 2014 01:20:13 +0000 (03:20 +0200)]
avformat/h263dec/h263_probe: Check PSC bit 9 and 13 in

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec: shift data in state to make more bits available to probe
Michael Niedermayer [Wed, 7 May 2014 01:12:34 +0000 (03:12 +0200)]
avformat/h263dec: shift data in state to make more bits available to probe

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/svq3: Fix "incompatible pointer type" warnings
Michael Niedermayer [Mon, 5 May 2014 21:30:35 +0000 (23:30 +0200)]
avcodec/svq3: Fix "incompatible pointer type" warnings

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Call ff_rfps_add_frame() only for video
Michael Niedermayer [Mon, 2 Jun 2014 15:09:53 +0000 (17:09 +0200)]
avformat/utils: Call ff_rfps_add_frame() only for video

This avoids some unneeded computations

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: fix assertion failure after 4h muxing
Michael Niedermayer [Fri, 30 May 2014 23:43:41 +0000 (01:43 +0200)]
avformat/flvenc: fix assertion failure after 4h muxing

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss4: Fix () in MKVAL() macro
Michael Niedermayer [Sun, 25 May 2014 03:19:09 +0000 (05:19 +0200)]
avcodec/mss4: Fix () in MKVAL() macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss34dsp: fix () in SOP* macros
Michael Niedermayer [Sun, 25 May 2014 03:18:47 +0000 (05:18 +0200)]
avcodec/mss34dsp: fix () in SOP* macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mlpdec: fix () in MSB_MASK() macro
Michael Niedermayer [Sun, 25 May 2014 03:17:51 +0000 (05:17 +0200)]
avcodec/mlpdec: fix () in MSB_MASK() macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ivi_dsp: add some missing () to macros
Michael Niedermayer [Sun, 25 May 2014 01:39:08 +0000 (03:39 +0200)]
avcodec/ivi_dsp: add some missing () to macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: fix () in macros
Michael Niedermayer [Sun, 25 May 2014 01:36:03 +0000 (03:36 +0200)]
avcodec/hevc: fix () in macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: fix () in macros
Michael Niedermayer [Sun, 25 May 2014 01:30:13 +0000 (03:30 +0200)]
avcodec/h264: fix () in macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/golomb-test: fix () in EXTEND() macro
Michael Niedermayer [Sun, 25 May 2014 01:27:56 +0000 (03:27 +0200)]
avcodec/golomb-test: fix () in EXTEND() macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro
Michael Niedermayer [Sun, 25 May 2014 01:19:47 +0000 (03:19 +0200)]
avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE
Michael Niedermayer [Wed, 21 May 2014 01:02:06 +0000 (03:02 +0200)]
avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/cpu: force mmx on selection of higher x86 SIMD features
Michael Niedermayer [Tue, 20 May 2014 03:23:52 +0000 (05:23 +0200)]
avutil/cpu: force mmx on selection of higher x86 SIMD features

Fixes various runtime failures with manually set flags that represent no
existing CPU

Fixes Ticket3653

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: move mc buffer allocation to per frame
Michael Niedermayer [Mon, 19 May 2014 04:19:23 +0000 (06:19 +0200)]
avcodec/diracdec: move mc buffer allocation to per frame

Fixes out of array accesses for non default buffers with large strides

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

5 years agoMerge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2
Michael Niedermayer [Mon, 2 Jun 2014 20:34:18 +0000 (22:34 +0200)]
Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2

* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01':
  ppc: Fix compilation for ppc64le (ELFv2)
  aarch64: Use the correct syntax for relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: allow seeking back to the begin even if nothing is marked as keyframe
Michael Niedermayer [Sun, 25 May 2014 23:23:16 +0000 (01:23 +0200)]
avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe

Fixes Ticket 3663

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

5 years agoFix spelling error 'Inconsistant -> Inconsistent'
Andreas Cadhalpun [Thu, 6 Mar 2014 18:03:07 +0000 (19:03 +0100)]
Fix spelling error 'Inconsistant -> Inconsistent'

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

5 years agoFix spelling errors in texi files: accomodate -> accommodate allows to -> allows...
Andreas Cadhalpun [Thu, 6 Mar 2014 18:07:53 +0000 (19:07 +0100)]
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission

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

5 years agoCorrect the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor...
Andreas Cadhalpun [Thu, 6 Mar 2014 17:58:04 +0000 (18:58 +0100)]
Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

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

5 years agoImprove the detection of architecture x86.
Andreas Cadhalpun [Mon, 26 May 2014 16:07:55 +0000 (18:07 +0200)]
Improve the detection of architecture x86.

This fixes building on Debian GNU/Hurd.

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

5 years agoppc: Fix compilation for ppc64le (ELFv2)
Thierry Fauck [Thu, 29 May 2014 12:22:27 +0000 (15:22 +0300)]
ppc: Fix compilation for ppc64le (ELFv2)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d6d767d93e532246cacf3567e6bcad76a821f838)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoaarch64: Use the correct syntax for relocations
Martin Storsjö [Thu, 29 May 2014 11:37:31 +0000 (14:37 +0300)]
aarch64: Use the correct syntax for relocations

This fixes building in PIC mode with gas. The examples in the gas
manual showed using a # here even though gas itself actually didn't
support that syntax (and the gas test suite only tests it without
the extra hash sign).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 08cd92144e73195eecc28ed0348e66e255516b82)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoffprobe: fix crash happening because of new streams occuring
Anshul [Wed, 14 May 2014 16:51:58 +0000 (22:21 +0530)]
ffprobe: fix crash happening because of new streams occuring

Fix trac ticket #3603.

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

5 years agoUse Matroska document version 2 for WebM files if possible.
Carl Eugen Hoyos [Mon, 12 May 2014 16:12:28 +0000 (18:12 +0200)]
Use Matroska document version 2 for WebM files if possible.

Google's plugin for the Internet Explorer refuses to play
files with another document version.

Fixes ticket #3583.
(cherry picked from commit ab21acecc72a0299895583cf83347ab5e2444b71)

5 years agoavformat/avidec: remove unused variables
Michael Niedermayer [Wed, 2 Apr 2014 17:04:58 +0000 (19:04 +0200)]
avformat/avidec: remove unused variables

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 16:10:27 +0000 (18:10 +0200)]
Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2

* commit 'e780c3daafe0588e035e752c771ebfcd2201746a':
  pcm-dvd: Fix 20bit decoding

Conflicts:
Changelog

See: 5db49fc38d9132e134de92584f296559bec3b789
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:59:58 +0000 (17:59 +0200)]
Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2

* commit '7f954ca502a16feeca44d4e9a7d450b404dabc94':
  avi: Improve non-interleaved detection

Conflicts:
Changelog
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()
Michael Niedermayer [Tue, 11 Mar 2014 18:18:23 +0000 (19:18 +0100)]
avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()

Fixes Ticket3421

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:31:57 +0000 (17:31 +0200)]
Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2

* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168':
  Update Changelog

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:31:20 +0000 (17:31 +0200)]
Merge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2

* commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:24:38 +0000 (17:24 +0200)]
Merge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2

* commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d':
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:10:07 +0000 (17:10 +0200)]
Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2

* commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3':
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:09:47 +0000 (17:09 +0200)]
Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2

* commit 'e2a83d72da866a29f5307a56f66c469966f02473':
  Update Changelog for v10.1

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:03:53 +0000 (17:03 +0200)]
Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2

* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5':
  Add missing changelog entries for v10

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:02:10 +0000 (17:02 +0200)]
Merge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2

* commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a':
  rtmpproto: Check the buffer sizes when copying app/playpath strings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:44:08 +0000 (16:44 +0200)]
Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2

* commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:41:41 +0000 (16:41 +0200)]
Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2

* commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:23:49 +0000 (16:23 +0200)]
Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2

* commit '194d12345d86c15b20b7e44a3679c9df3075d7f6':
  dcadec: Use correct channel count in stereo downmix check

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:23:29 +0000 (16:23 +0200)]
Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2

* commit 'b3d8276d2dc913d708d187fb15f6e98869d00500':
  dcadec: Do not decode the XCh extension when downmixing to stereo

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcm-dvd: Fix 20bit decoding
nu774 [Fri, 9 May 2014 12:47:41 +0000 (21:47 +0900)]
pcm-dvd: Fix 20bit decoding

Increment the pointer as needed.

Bug-Id: 592

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 9880a0d4b131ef36694d62f78060350a81f08b80)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoavi: Improve non-interleaved detection
Michael Niedermayer [Wed, 2 Apr 2014 07:11:10 +0000 (09:11 +0200)]
avi: Improve non-interleaved detection

Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>.

Check the index for streams with a time drift of 2s or a buffer drift
of 64MB.

Bug-Id: 666
CC: libav-stable@libav.org
Sample-Id: yet-another-broken-interleaved-avi.avi

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9d599e3f6e61438772d8cddd6c9b7c495251f51e)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoUpdate Changelog
John Stebbins [Mon, 3 Mar 2014 20:20:14 +0000 (20:20 +0000)]
Update Changelog

5 years agoarm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

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