ffmpeg.git
5 years agoMerge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 13:47:30 +0000 (15:47 +0200)]
Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1

* commit '80c268eaaee402695a74d14acf76063100692a99':
  cdgraphics: do not return 0 from the decode function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 13:45:19 +0000 (15:45 +0200)]
Merge commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83' into release/1.1

* commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83':
  cdgraphics: switch to bytestream2

Conflicts:
libavcodec/cdgraphics.c

See: ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c53effc41b9359261b17c8da3b7062369cafd686' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 13:19:40 +0000 (15:19 +0200)]
Merge commit 'c53effc41b9359261b17c8da3b7062369cafd686' into release/1.1

* commit 'c53effc41b9359261b17c8da3b7062369cafd686':
  huffyuvdec: check width size for yuv422p

Conflicts:
libavcodec/huffyuvdec.c

See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ede738880032db62b7dc5b3712f769d3826f5974' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 13:16:43 +0000 (15:16 +0200)]
Merge commit 'ede738880032db62b7dc5b3712f769d3826f5974' into release/1.1

* commit 'ede738880032db62b7dc5b3712f769d3826f5974':
  mmvideo: check horizontal coordinate too

See: See: 8d3c99e825317b7efda5fd12e69896b47c700303
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '36d8914f1b94e4731d2fc67162902839c106e72e' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:56:58 +0000 (14:56 +0200)]
Merge commit '36d8914f1b94e4731d2fc67162902839c106e72e' into release/1.1

* commit '36d8914f1b94e4731d2fc67162902839c106e72e':
  wmalosslessdec: fix mclms_coeffs* array size

See: ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:45:18 +0000 (14:45 +0200)]
Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1

* commit '146b187113e3cc20c2a97c5f264da13e701ca247':
  lavc: Check the image size before calling get_buffer

Conflicts:
libavcodec/utils.c

See: 668494acd8b20f974c7722895d4a6a14c1005f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:38:20 +0000 (14:38 +0200)]
Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1

* commit '43d676432740c6d5e5234ed343f13902909fd124':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '512354191328c559fcff56070dab897ee2a1b4c1' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:33:02 +0000 (14:33 +0200)]
Merge commit '512354191328c559fcff56070dab897ee2a1b4c1' into release/1.1

* commit '512354191328c559fcff56070dab897ee2a1b4c1':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
libavcodec/h264_sei.c

See: 9decfc17bb76da34734296048d390b176abf404c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '01f9540320279954b2764645ab7136847d53d89f' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:24:54 +0000 (14:24 +0200)]
Merge commit '01f9540320279954b2764645ab7136847d53d89f' into release/1.1

* commit '01f9540320279954b2764645ab7136847d53d89f':
  h264_sei: check SEI size

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '00915d3cd2ce61db3d6dc11f63566630a9aff4ec' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:19:24 +0000 (14:19 +0200)]
Merge commit '00915d3cd2ce61db3d6dc11f63566630a9aff4ec' into release/1.1

* commit '00915d3cd2ce61db3d6dc11f63566630a9aff4ec':
  pgssubdec: Check RLE size before copying

See: c0d68be555f5858703383040e04fcd6529777061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:14:06 +0000 (14:14 +0200)]
Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1

* commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:06:51 +0000 (14:06 +0200)]
Merge commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e' into release/1.1

* commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e':
  video4linux2: Avoid a floating point exception

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 12:06:36 +0000 (14:06 +0200)]
Merge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1

* commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
libavfilter/f_select.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 11:51:59 +0000 (13:51 +0200)]
Merge commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8' into release/1.1

* commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8':
  eamad: use the bytestream2 API instead of AV_RL

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3ecbd911ff9177097820e5d00401c9bf29e5d167' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 11:47:08 +0000 (13:47 +0200)]
Merge commit '3ecbd911ff9177097820e5d00401c9bf29e5d167' into release/1.1

* commit '3ecbd911ff9177097820e5d00401c9bf29e5d167':
  Update Changelog for v9.14
  Prepare for 9.14 Release

Conflicts:
Changelog
RELEASE

Not merged as this doesnt apply 1:1 to our releases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 11:32:51 +0000 (13:32 +0200)]
Merge commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240' into release/1.1

* commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240':
  adpcm: Write the proper predictor in trellis mode in IMA QT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '744e7eea5d815efea777b6179d96e8d94b63ccfa' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 11:30:17 +0000 (13:30 +0200)]
Merge commit '744e7eea5d815efea777b6179d96e8d94b63ccfa' into release/1.1

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 10:50:57 +0000 (12:50 +0200)]
Merge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1

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

Conflicts:
libavformat/mp3enc.c

See: See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f' into release/1.1
Michael Niedermayer [Fri, 8 Aug 2014 10:48:51 +0000 (12:48 +0200)]
Merge commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f' into release/1.1

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocdgraphics: do not return 0 from the decode function
Anton Khirnov [Wed, 6 Aug 2014 10:56:34 +0000 (10:56 +0000)]
cdgraphics: do not return 0 from the decode function

0 means no data consumed, so it can trigger an infinite loop in the
caller.

CC:libav-stable@libav.org
(cherry picked from commit c7d9b473e28238d4a4ef1b7e8b42c1cca256da36)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavcodec/cdgraphics.c

5 years agocdgraphics: switch to bytestream2
Anton Khirnov [Wed, 6 Aug 2014 10:46:50 +0000 (10:46 +0000)]
cdgraphics: switch to bytestream2

Fixes possible invalid memory accesses on corrupted data.

CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674
(cherry picked from commit a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohuffyuvdec: check width size for yuv422p
Michael Niedermayer [Sat, 2 Aug 2014 23:54:33 +0000 (00:54 +0100)]
huffyuvdec: check width size for yuv422p

Avoid out of array accesses.

CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit a7153444df9040bf6ae103e0bbf6104b66f974cb)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agommvideo: check horizontal coordinate too
Michael Niedermayer [Sun, 3 Aug 2014 18:24:18 +0000 (19:24 +0100)]
mmvideo: check horizontal coordinate too

Fixes out of array accesses.

Bug-Id: CVE-2013-3672
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 70cd3b8e659c3522eea5c16a65d14b8658894a94)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agowmalosslessdec: fix mclms_coeffs* array size
Michael Niedermayer [Fri, 7 Feb 2014 14:07:23 +0000 (15:07 +0100)]
wmalosslessdec: fix mclms_coeffs* array size

Fixes corruption of context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 849b9d34c7ef70b370c53e7af3940f51cbc07d0f)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolavc: Check the image size before calling get_buffer
Luca Barbato [Mon, 4 Aug 2014 12:15:45 +0000 (14:15 +0200)]
lavc: Check the image size before calling get_buffer

Bug-Id: CVE-2011-3935
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agohuffyuv: Check and propagate function return values
Diego Biurrun [Sun, 3 Aug 2014 19:19:10 +0000 (12:19 -0700)]
huffyuv: Check and propagate function return values

Bug-Id: CVE-2013-0868

inspired by a patch from Michael Niedermayer <michaelni@gmx.at>
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 744b406ff3474e77543bcf86125a2f7bc7deaa18)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavcodec/huffyuvdec.c

5 years agoh264: prevent theoretical infinite loop in SEI parsing
Vittorio Giovara [Wed, 30 Jul 2014 18:33:36 +0000 (19:33 +0100)]
h264: prevent theoretical infinite loop in SEI parsing

Properly address CVE-2011-3946 and parse bitstream as described in the spec.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agoh264_sei: check SEI size
Michael Niedermayer [Thu, 19 Sep 2013 14:26:25 +0000 (16:26 +0200)]
h264_sei: check SEI size

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agopgssubdec: Check RLE size before copying
Michael Niedermayer [Thu, 31 Jul 2014 01:31:19 +0000 (21:31 -0400)]
pgssubdec: Check RLE size before copying

Make sure the buffer size does not exceed the expected
RLE size.

Prevent an out of array bound write.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bug-Id: CVE-2013-0852

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit a1f7844a11010d8552c75424d1a831b37a0ae5d9)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agofate: Add dependencies for dct/fft/mdct/rdft tests
Diego Biurrun [Thu, 26 Jun 2014 00:09:13 +0000 (17:09 -0700)]
fate: Add dependencies for dct/fft/mdct/rdft tests

(cherry picked from commit d396987c303bdc4eea7d1a1ff6776475d9bbd9ea)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavcodec/fft-test.c

5 years agovideo4linux2: Avoid a floating point exception
Bernhard Übelacker [Sun, 27 Jul 2014 15:38:59 +0000 (08:38 -0700)]
video4linux2: Avoid a floating point exception

This avoids a segfault in avconv_opt.c:opt_target when trying to
determine the norm.

(cherry picked from commit dc71f1958846bb1d96de43a4603983dc8450cfcc)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agovf_select: Drop a debug av_log with an unchecked double to enum conversion
Diego Biurrun [Tue, 29 Jul 2014 12:43:04 +0000 (05:43 -0700)]
vf_select: Drop a debug av_log with an unchecked double to enum conversion

CC: libav-stable@libav.org
(cherry picked from commit a8d803a320fb08b3ad5db4fffc79abd401206905)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoeamad: use the bytestream2 API instead of AV_RL
Anton Khirnov [Sun, 20 Jul 2014 12:06:47 +0000 (12:06 +0000)]
eamad: use the bytestream2 API instead of AV_RL

This is safer and possibly fixes invalid reads on truncated data.
(cherry-picked from commit 541427ab4d5b4b6f5a90a687a06decdb78e7bc3c)

CC:libav-stable@libav.org

Conflicts:
libavcodec/eamad.c

(cherry picked from commit f9204ec56a4cf73843d1e5b8563d3584c2c05b47)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoUpdate Changelog for v9.14
Reinhard Tartler [Fri, 27 Jun 2014 01:27:56 +0000 (21:27 -0400)]
Update Changelog for v9.14

5 years agoPrepare for 9.14 Release
Reinhard Tartler [Fri, 27 Jun 2014 01:23:39 +0000 (21:23 -0400)]
Prepare for 9.14 Release

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 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

Conflicts:
libavcodec/mpegaudiodecheader.c

5 years agoUpdate for FFmpeg 1.1.12 n1.1.12
Michael Niedermayer [Wed, 25 Jun 2014 22:13:49 +0000 (00:13 +0200)]
Update for FFmpeg 1.1.12

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 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/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)
(cherry picked from commit 9c9fc79d9237d28e33161cb2e75082d8ad232b2e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1
Michael Niedermayer [Wed, 25 Jun 2014 20:40:30 +0000 (22:40 +0200)]
Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1

* commit '503322f97c5a25a020933ed4ab510697d5f5b4af':
  lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 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 agoMerge commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5' into release/1.1
Michael Niedermayer [Thu, 19 Jun 2014 23:22:12 +0000 (01:22 +0200)]
Merge commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5' into release/1.1

* commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5':
  sgidec: fix an incorrect backport

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1
Michael Niedermayer [Thu, 19 Jun 2014 23:11:54 +0000 (01:11 +0200)]
Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1

* commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc':
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0' into release/1.1
Michael Niedermayer [Thu, 19 Jun 2014 23:00:59 +0000 (01:00 +0200)]
Merge commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0' into release/1.1

* commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0':
  avconv: make -shortest work with streamcopy

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6' into release/1.1
Michael Niedermayer [Thu, 19 Jun 2014 22:48:51 +0000 (00:48 +0200)]
Merge commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6' into release/1.1

* commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6':
  matroskaenc: do not write negative timestamps

Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

No change to fate as ffmpeg was not affected by these bugs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosgidec: fix an incorrect backport
Sean McGovern [Mon, 2 Jun 2014 21:42:17 +0000 (17:42 -0400)]
sgidec: fix an incorrect backport

Bug-Id: 691

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavconv: do not send non-monotonous DTS to the muxers.
Anton Khirnov [Wed, 24 Apr 2013 06:34:44 +0000 (08:34 +0200)]
avconv: do not send non-monotonous DTS to the muxers.

Hack partially based on a commit by Michael Niedermayer <michaelni@gmx.at>
Should fix (or work around) bug 458.
(cherry picked from commit 76d23f40314fc1dcd74a3d470b17782cc0ee5a3a)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
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 agomatroskaenc: do not write negative timestamps
Anton Khirnov [Sun, 1 Jun 2014 10:40:20 +0000 (12:40 +0200)]
matroskaenc: do not write negative timestamps

Bug-Id: 597, 341

5 years agoUpdate for 1.1.11 n1.1.11
Michael Niedermayer [Sat, 10 May 2014 20:12:32 +0000 (22:12 +0200)]
Update for 1.1.11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws: dont use the optimized 410->420 unscaled conversion when height%4
Michael Niedermayer [Wed, 30 Apr 2014 04:21:58 +0000 (06:21 +0200)]
sws: dont use the optimized 410->420 unscaled conversion when height%4

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/graphdump: Fix pointer to local outside scope
Michael Niedermayer [Mon, 28 Apr 2014 02:01:50 +0000 (04:01 +0200)]
avfilter/graphdump: Fix pointer to local outside scope

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Fix undefined shift
Michael Niedermayer [Sun, 27 Apr 2014 03:32:56 +0000 (05:32 +0200)]
avcodec/mjpegdec: Fix undefined shift

Fixes CID1194388

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_filter: fix pointer to local outside scope
Michael Niedermayer [Sun, 27 Apr 2014 01:45:12 +0000 (03:45 +0200)]
ffmpeg_filter: fix pointer to local outside scope

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input
Michael Niedermayer [Wed, 23 Apr 2014 23:25:46 +0000 (01:25 +0200)]
swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

Fixes Ticket 3542

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec: Fix h263 probe
Michael Niedermayer [Wed, 23 Apr 2014 19:47:48 +0000 (21:47 +0200)]
avformat/h263dec: Fix h263 probe

The code was missing 1 bit in the src format

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: Check for and remove invalid packet durations
Michael Niedermayer [Wed, 23 Apr 2014 04:04:50 +0000 (06:04 +0200)]
avformat/mux: Check for and remove invalid packet durations

Fixes assertion failure
Fixes Ticket3575

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1
Michael Niedermayer [Mon, 5 May 2014 14:21:25 +0000 (16:21 +0200)]
Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1

* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
  update Changelog

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 21:46:44 +0000 (23:46 +0200)]
Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1

* commit '1f5678c5e404ebd326f6eae1b527beadaa85a528':
  Update Changelog for v9.13

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 21:46:08 +0000 (23:46 +0200)]
Merge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1

* commit '9a2387cfb1a99e4b00593c22074929cdc73410f0':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 21:45:24 +0000 (23:45 +0200)]
Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1

* commit '696a74e81560889ef2fde76b045c5158a325a7a5':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.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 agoMerge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:49:00 +0000 (22:49 +0200)]
Merge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1

* commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:47:41 +0000 (22:47 +0200)]
Merge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1

* commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
libavformat/oggparseopus.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:36:26 +0000 (22:36 +0200)]
Merge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1

* commit '05de372350f8720461d3cadba40836546f1bb95c':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
libavcodec/apedec.c

See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:26:07 +0000 (22:26 +0200)]
Merge commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f' into release/1.1

* commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f':
  isom: lpcm in mov default to big endian

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:14:56 +0000 (22:14 +0200)]
Merge commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07' into release/1.1

* commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07':
  movdec: handle 0x7fff langcode as macintosh per the specs

See: e636aa1a56bcd91242c25282dcb00929196470eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:14:42 +0000 (22:14 +0200)]
Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1

* commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c':
  h264: reset next_output_pic earlier in start_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:02:03 +0000 (22:02 +0200)]
Merge commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d' into release/1.1

* commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d':
  Revert "pthread: flush all threads on flush, not just the first one"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoupdate Changelog
Rafaël Carré [Tue, 27 Aug 2013 15:35:49 +0000 (17:35 +0200)]
update Changelog

5 years agoUpdate Changelog for v9.13
Reinhard Tartler [Sun, 4 May 2014 14:37:49 +0000 (10:37 -0400)]
Update Changelog for v9.13

5 years agoswscale: Fix an undefined behaviour
Luca Barbato [Thu, 1 May 2014 22:21:23 +0000 (00:21 +0200)]
swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3a177a9cca924e097265b32f9282814f6b653e08)
(cherry picked from commit 0499f7809c1fcc33ed710cdf771a18b374702135)

5 years agomatroska: add the Opus mapping
Anton Khirnov [Sun, 27 Apr 2014 11:40:11 +0000 (13:40 +0200)]
matroska: add the Opus mapping

(cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 79041d92ee7421853ee8c57fc13891cb0c272e0e)

5 years agomp3enc: Properly write bitrate value in XING header
Michael Niedermayer [Wed, 9 Apr 2014 16:22:53 +0000 (18:22 +0200)]
mp3enc: Properly write bitrate value in XING header

Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.

Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.

Bug-Id: https://bugs.debian.org/736088

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 617a1a98a6be3e59db6fbfc21afab2fb9a049c03)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb)

5 years agooggdec: add support for Opus in Ogg demuxing
Nicolas George [Sun, 24 Jun 2012 09:38:18 +0000 (11:38 +0200)]
oggdec: add support for Opus in Ogg demuxing

Fixes: https://bugzilla.libav.org/show_bug.cgi?id=603
Fixes: http://bugs.debian.org/720563

(cherry picked from commit ecab1c77410f023b437c6ed3a3281be8f039e574)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoapedec: do not buffer decoded samples over AVPackets
Rafaël Carré [Tue, 27 Aug 2013 15:35:49 +0000 (17:35 +0200)]
apedec: do not buffer decoded samples over AVPackets

Only consume an AVPacket when all the samples have been read.

When the rate of samples output is limited (by the default value
of max_samples), consuming the first packet immediately will cause
timing problems:

- The first packet with PTS 0 will output 4608 samples and be
consumed entirely
- The second packet with PTS 64 will output the remaining samples
(typically, a lot, that's why max_samples exist) until the decoded
samples of the first packet have been exhausted, at which point the
samples of the second packet will be decoded and output when
av_decode_frame is called with the next packet).

That means there's a PTS jump since the first packet is 'decoded'
immediately, which can be seen with avplay or mplayer: the timing
jumps immediately to 6.2s (which is the size of a packet).

Sample: http://streams.videolan.org/issues/6348/Goldwave-MAClib.ape

Bug-Debian: http://bugs.debian.org/744901
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
(cherry picked from commit 91d4cfb8127f1de6c4ad173a30fffe584700046d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoisom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
(cherry picked from commit 360022bd3b894cc01ea112b275fa4c8f53881808)
(cherry picked from commit d37fac6dbbdddb76225aa691b83ffd9a0c7dae6b)

5 years agomovdec: handle 0x7fff langcode as macintosh per the specs
Baptiste Coudurier [Wed, 21 Mar 2012 21:18:16 +0000 (14:18 -0700)]
movdec: handle 0x7fff langcode as macintosh per the specs

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

(cherry picked from commit 9e71cc81f3655cacf0f91860fba3043f13b64059)
(cherry picked from commit 7940306a47df602be4f57a62175706265bbfd0aa)

5 years agoh264: reset next_output_pic earlier in start_frame()
Anton Khirnov [Wed, 23 Apr 2014 20:26:40 +0000 (22:26 +0200)]
h264: reset next_output_pic earlier in start_frame()

In case start_frame() fails, this potentially invalid frame can still be
output to the caller.

Bug-Id: 672
Bug-Id: debian/741240
Bug-Id: ubuntu/1288206

5 years agoRevert "pthread: flush all threads on flush, not just the first one"
Anton Khirnov [Thu, 24 Apr 2014 05:40:34 +0000 (07:40 +0200)]
Revert "pthread: flush all threads on flush, not just the first one"

This reverts commit 2eb15cdeef29eb8a0a32658154decba94b4b89cb.

It does not work correctly in pre-refcounting threading code.

5 years agoUpdate for FFmpeg 1.1.10 n1.1.10
Michael Niedermayer [Mon, 21 Apr 2014 23:01:20 +0000 (01:01 +0200)]
Update for FFmpeg 1.1.10

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/filtfmts: Support dynamically allocated in/outputs
Michael Niedermayer [Mon, 21 Apr 2014 09:33:17 +0000 (11:33 +0200)]
avfilter/filtfmts: Support dynamically allocated in/outputs

Fixes crash
Fixes Ticket3468

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_deshake: fix loss of precission with odd resolutions
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/vf_deshake: fix loss of precission with odd resolutions

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73734282e0e4df92269984ee1671424e39249481)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g723_1: add assert to help static code analyzers
Michael Niedermayer [Wed, 16 Apr 2014 00:55:13 +0000 (02:55 +0200)]
avcodec/g723_1: add assert to help static code analyzers

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: fix undefined behavior with shifts
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/diracdec: fix undefined behavior with shifts

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Remove redundant check
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avformat/mpegts: Remove redundant check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ff6fa0b4b980fc5b9f7653d7b159ae02c3d95210)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale: fix srcStride/srcSlice typo
Michael Niedermayer [Tue, 15 Apr 2014 23:55:08 +0000 (01:55 +0200)]
swscale/swscale: fix srcStride/srcSlice typo

Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 14fa7fc6a81d5e59e05243cdc92108eab1b138ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/idct_sse2_xvid: fix non C99 inline function
Michael Niedermayer [Mon, 14 Apr 2014 15:29:27 +0000 (17:29 +0200)]
avcodec/x86/idct_sse2_xvid: fix non C99 inline function

Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 46d5625f44185271862337d61cd246fd569c42a4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dirac_arith: Fix build with PIC and stack-check options
Anthoine Bourgeois [Wed, 9 Apr 2014 10:18:32 +0000 (12:18 +0200)]
avcodec/dirac_arith: Fix build with PIC and stack-check options

Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/swscale_template: loose hardcoded dstw_offset
Michael Niedermayer [Tue, 8 Apr 2014 16:12:12 +0000 (18:12 +0200)]
swscale/x86/swscale_template: loose hardcoded dstw_offset

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/resample: use av_malloc_array() where appropriate
Michael Niedermayer [Mon, 7 Apr 2014 22:29:26 +0000 (00:29 +0200)]
swresample/resample: use av_malloc_array() where appropriate

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

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