ffmpeg.git
5 years agoUpdate for 0.10.15 n0.10.15
Michael Niedermayer [Tue, 12 Aug 2014 18:44:27 +0000 (20:44 +0200)]
Update for 0.10.15

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcmenc: set correct bitrate value
Mans Rullgard [Tue, 15 May 2012 23:01:34 +0000 (00:01 +0100)]
pcmenc: set correct bitrate value

This fixes a bogus bitrate value in the header of WAV files with
alaw/ulaw audio.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f)

Conflicts:

libavcodec/pcm.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 18:28:37 +0000 (20:28 +0200)]
Merge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10

* commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d':
  ffv1dec: check that global parameters do not change in version 0/1

Conflicts:
libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 18:25:55 +0000 (20:25 +0200)]
Merge commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55' into release/0.10

* commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55':
  avcodec: Add more missing #includes for ff_get_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 18:25:20 +0000 (20:25 +0200)]
Merge commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708' into release/0.10

* commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708':
  Prepare for 0.8.15 Release

Conflicts:
RELEASE

Not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libspeexdec: fix missing header includes
Michael Niedermayer [Tue, 12 Aug 2014 18:09:50 +0000 (20:09 +0200)]
avcodec/libspeexdec: fix missing header includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 18:01:44 +0000 (20:01 +0200)]
Merge commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347' into release/0.10

* commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347':
  lavf: Fix leftovers from the ff_get_buffer patch

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 18:01:22 +0000 (20:01 +0200)]
Merge commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7' into release/0.10

* commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7':
  configure: Check for -Werror parameters on clang

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 17:23:34 +0000 (19:23 +0200)]
Merge commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b' into release/0.10

* commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b':
  avcodec: Introduce ff_get_buffer

Conflicts:
libavcodec/8svx.c
libavcodec/dpcm.c
libavcodec/utils.c
libavcodec/vmdav.c
libavcodec/yop.c

See: 668494acd8b20f974c7722895d4a6a14c1005f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '042c25f54bd25b52d2936b822be026450971a82d' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 17:12:14 +0000 (19:12 +0200)]
Merge commit '042c25f54bd25b52d2936b822be026450971a82d' into release/0.10

* commit '042c25f54bd25b52d2936b822be026450971a82d':
  Update Changelog for v0.8.14

Conflicts:
Changelog

Not merged as the Changelog isnt correct for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dcc68de942f06d358192a57057adb133f7c40dd7' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 17:10:30 +0000 (19:10 +0200)]
Merge commit 'dcc68de942f06d358192a57057adb133f7c40dd7' into release/0.10

* commit 'dcc68de942f06d358192a57057adb133f7c40dd7':
  vp3: Copy all 3 frames for thread updates

See: 247d30a7dba6684ccce4508424f35fd58465e535
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 17:08:55 +0000 (19:08 +0200)]
Merge commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117' into release/0.10

* commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
libavformat/mpegtsenc.c

See: 68b14c044a4a00d69aeb620bdb57dce533c4190a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd86df7dd497ead1132bd95df7c4c18d91fbe3def' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 17:01:25 +0000 (19:01 +0200)]
Merge commit 'd86df7dd497ead1132bd95df7c4c18d91fbe3def' into release/0.10

* commit 'd86df7dd497ead1132bd95df7c4c18d91fbe3def':
  mpegts: Define the section length with a constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 17:00:30 +0000 (19:00 +0200)]
Merge commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200' into release/0.10

* commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200':
  Update Changelog for v0.8.14
  Prepare for 0.8.14 Release

Conflicts:
Changelog
RELEASE

No change as this does not apply to FFmpeg 1:1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 16:58:04 +0000 (18:58 +0200)]
Merge commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de' into release/0.10

* commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de':
  error_concealment: avoid using the picture if not fully setup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"
Michael Niedermayer [Thu, 7 Aug 2014 00:27:07 +0000 (02:27 +0200)]
avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"

Add padding, clear size, use the correct pointer.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d5f4f025304ac7c69775179044e6f69f370441a' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 16:51:18 +0000 (18:51 +0200)]
Merge commit '9d5f4f025304ac7c69775179044e6f69f370441a' into release/0.10

* commit '9d5f4f025304ac7c69775179044e6f69f370441a':
  svq1: do not modify the input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 16:47:20 +0000 (18:47 +0200)]
Merge commit 'cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904' into release/0.10

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10
Michael Niedermayer [Tue, 12 Aug 2014 16:25:32 +0000 (18:25 +0200)]
Merge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10

* commit '3aebdffb010df025728d6c2af89642f9634aa806':
  cdgraphics: switch to bytestream2

Conflicts:
libavcodec/cdgraphics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1dec: check that global parameters do not change in version 0/1
Michael Niedermayer [Fri, 30 Aug 2013 02:51:09 +0000 (04:51 +0200)]
ffv1dec: check that global parameters do not change in version 0/1

Such changes are neither allowed nor supported

Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit da7d839a0d3ec40423a665dc85e0cfaed3f92eb8)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavcodec/ffv1dec.c

5 years agoMerge commit 'a1804df66a4064aa30554a11e4fd6cdac3ed89c0' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 18:20:57 +0000 (20:20 +0200)]
Merge commit 'a1804df66a4064aa30554a11e4fd6cdac3ed89c0' into release/0.10

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e17dc0a254ac8d3c33887a114a66e2b659ba0bc5' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 18:19:22 +0000 (20:19 +0200)]
Merge commit 'e17dc0a254ac8d3c33887a114a66e2b659ba0bc5' into release/0.10

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:58:37 +0000 (19:58 +0200)]
Merge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10

* commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '50493f1f7d2235db811d2991b9e5b330baf7c05a' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:42:27 +0000 (19:42 +0200)]
Merge commit '50493f1f7d2235db811d2991b9e5b330baf7c05a' into release/0.10

* commit '50493f1f7d2235db811d2991b9e5b330baf7c05a':
  twinvq: fix out of bounds array access

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3e60501f311c50bf234033f206c19d34d889df01' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:42:07 +0000 (19:42 +0200)]
Merge commit '3e60501f311c50bf234033f206c19d34d889df01' into release/0.10

* commit '3e60501f311c50bf234033f206c19d34d889df01':
  h264: slice-mt: check master context for valid current_picture_ptr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:41:27 +0000 (19:41 +0200)]
Merge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10

* commit '7585a6254bbb38148e4467793fc34211b79d5f7d':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:30:07 +0000 (19:30 +0200)]
Merge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10

* commit '184c79729d4011f33027bcdc61a63d521017ebc1':
  h264_sei: check SEI size

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a465ed5707f5cbc9713d5e9629d424cd2d46e038' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:20:39 +0000 (19:20 +0200)]
Merge commit 'a465ed5707f5cbc9713d5e9629d424cd2d46e038' into release/0.10

* commit 'a465ed5707f5cbc9713d5e9629d424cd2d46e038':
  pgssubdec: Check RLE size before copying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:20:25 +0000 (19:20 +0200)]
Merge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10

* commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99':
  x86: Fix linking with some or all of yasm, mmx, optimizations disabled

Conflicts:
libavcodec/x86/mpegaudiodec_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:15:49 +0000 (19:15 +0200)]
Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10

* commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a':
  cmdutils: Conditionally compile libswscale-related bits

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:13:54 +0000 (19:13 +0200)]
Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10

* commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5':
  video4linux2: Avoid a floating point exception

Conflicts:
avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e4fdfdf65d520ce3af13a21ff8a3649e37757af8' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 17:12:38 +0000 (19:12 +0200)]
Merge commit 'e4fdfdf65d520ce3af13a21ff8a3649e37757af8' into release/0.10

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '187cfd3c13a1deb47661486824a5b8f41e158a7a' into release/0.10
Michael Niedermayer [Sat, 9 Aug 2014 16:59:24 +0000 (18:59 +0200)]
Merge commit '187cfd3c13a1deb47661486824a5b8f41e158a7a' into release/0.10

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

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Add more missing #includes for ff_get_buffer()
Reinhard Tartler [Sat, 9 Aug 2014 15:22:11 +0000 (08:22 -0700)]
avcodec: Add more missing #includes for ff_get_buffer()

5 years agoPrepare for 0.8.15 Release
Reinhard Tartler [Sat, 9 Aug 2014 13:09:24 +0000 (09:09 -0400)]
Prepare for 0.8.15 Release

5 years agolavf: Fix leftovers from the ff_get_buffer patch
Luca Barbato [Sat, 9 Aug 2014 12:14:34 +0000 (14:14 +0200)]
lavf: Fix leftovers from the ff_get_buffer patch

The automated script did not perfectly replace all the instances nor
added internal.h in all the files requiring it.

5 years agoconfigure: Check for -Werror parameters on clang
Martin Storsjö [Tue, 13 Nov 2012 17:01:51 +0000 (19:01 +0200)]
configure: Check for -Werror parameters on clang

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 9eded0fe412e610ee8944681d5c554b723463e96)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec: Introduce ff_get_buffer
Luca Barbato [Fri, 8 Aug 2014 16:07:43 +0000 (18:07 +0200)]
avcodec: Introduce ff_get_buffer

Validate the image size there as is done in the other release
branches.

Bug-Id: CVE-2011-3935
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agoUpdate Changelog for v0.8.14
Reinhard Tartler [Sat, 9 Aug 2014 00:49:45 +0000 (20:49 -0400)]
Update Changelog for v0.8.14

5 years agovp3: Copy all 3 frames for thread updates
Michael Niedermayer [Mon, 4 Aug 2014 00:06:51 +0000 (01:06 +0100)]
vp3: Copy all 3 frames for thread updates

Fixes a double release of the current frame on deinit.

Bug-Id: CVE-2011-3934
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agompegts: Do not try to write a PMT larger than SECTION_SIZE
Luca Barbato [Thu, 7 Aug 2014 15:10:32 +0000 (17:10 +0200)]
mpegts: Do not try to write a PMT larger than SECTION_SIZE

Prevent out of array write.

Similar to what Michael Niedermayer did to address the same issue.

Bug-Id: CVE-2014-2263
CC: libav-stable@libav.org
(cherry picked from commit addbaf134836aea4e14f73add8c6d753a1373257)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agompegts: Define the section length with a constant
Luca Barbato [Sun, 3 Aug 2014 17:27:07 +0000 (19:27 +0200)]
mpegts: Define the section length with a constant

The specification says the value is expressed in 10 bits including
the 4-byte CRC.

(cherry picked from commit 694b7cd873f8b06af109036eff1ccd741afdd28e)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavformat/mpegtsenc.c

5 years agoUpdate Changelog for v0.8.14
Reinhard Tartler [Thu, 7 Aug 2014 00:24:20 +0000 (20:24 -0400)]
Update Changelog for v0.8.14

5 years agoPrepare for 0.8.14 Release
Reinhard Tartler [Thu, 7 Aug 2014 00:24:47 +0000 (20:24 -0400)]
Prepare for 0.8.14 Release

5 years agoerror_concealment: avoid using the picture if not fully setup
Michael Niedermayer [Wed, 6 Aug 2014 17:19:57 +0000 (18:19 +0100)]
error_concealment: avoid using the picture if not fully setup

Fixes state becoming inconsistent and a null pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CVE-2013-0860
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>
5 years agosvq1: do not modify the input packet
Anton Khirnov [Sun, 3 Aug 2014 08:14:48 +0000 (10:14 +0200)]
svq1: do not modify the input packet

The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.

Also, check the size of the header, avoiding invalid reads on truncated
data.

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

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>
Conflicts:
libavcodec/huffyuvdec.c

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 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 agotwinvq: fix out of bounds array access
Mans Rullgard [Tue, 1 May 2012 17:27:19 +0000 (18:27 +0100)]
twinvq: fix out of bounds array access

ModeTab.fmode has only 3 elements, so indexing it with ftype
in the initialier for 'size' is invalid when ftype == FT_PPC.

This fixes crashes with gcc 4.8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4bf2e7c5f1c0ad3997fd7c9859c16db8e4e16df6)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoh264: slice-mt: check master context for valid current_picture_ptr
Janne Grunau [Wed, 5 Dec 2012 19:08:01 +0000 (20:08 +0100)]
h264: slice-mt: check master context for valid current_picture_ptr

Fixes errors in slice based multithreading introduced in 0b300daad2f5.

CC: libav-stable@libav.org
(cherry picked from commit 5945c7b35d9169caf9ecef1c419eebdebb909e60)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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 00915d3cd2ce61db3d6dc11f63566630a9aff4ec)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agox86: Fix linking with some or all of yasm, mmx, optimizations disabled
Diego Biurrun [Wed, 29 Aug 2012 09:14:17 +0000 (11:14 +0200)]
x86: Fix linking with some or all of yasm, mmx, optimizations disabled

Some optimized template functions reference optimized symbols, so they
must be explicitly disabled when those symbols are unavailable.

(cherry picked from commit ec36aa69448f20a78d8c4588265022e0b2272ab5)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agocmdutils: Conditionally compile libswscale-related bits
Diego Biurrun [Mon, 29 Oct 2012 17:00:14 +0000 (18:00 +0100)]
cmdutils: Conditionally compile libswscale-related bits

This fixes compilation with libswscale disabled.

(cherry picked from commit ab799664755c8bc2c439c428ff5b538c105a5c38)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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 for FFmpeg 0.10.14 n0.10.14
Michael Niedermayer [Sun, 29 Jun 2014 01:26:12 +0000 (03:26 +0200)]
update for FFmpeg 0.10.14

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10
Michael Niedermayer [Sun, 29 Jun 2014 01:10:10 +0000 (03:10 +0200)]
Merge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10

* commit 'e122fb594a5feb6729cce86a70aafd93d10202d8':
  Update Changelog for 0.8.13
  Prepare for 0.8.13 Release

Conflicts:
Changelog
RELEASE

merge for metadata only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10
Michael Niedermayer [Sun, 29 Jun 2014 01:08:22 +0000 (03:08 +0200)]
Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10

* commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f':
  lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoUpdate Changelog for 0.8.13
Reinhard Tartler [Fri, 27 Jun 2014 01:34:03 +0000 (21:34 -0400)]
Update Changelog for 0.8.13

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

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>
Conflicts:
libavutil/lzo.c

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)

Conflicts:

libavutil/lzo.c
(cherry picked from commit 7b5c706494a775b2b0d0e0a38448610802eef8f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9c7321e2b8981ec867294309e9cf3833055df78f' into release/0.10
Michael Niedermayer [Thu, 19 Jun 2014 23:32:25 +0000 (01:32 +0200)]
Merge commit '9c7321e2b8981ec867294309e9cf3833055df78f' into release/0.10

* commit '9c7321e2b8981ec867294309e9cf3833055df78f':
  sgidec: fix an incorrect backport

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoupdate for 0.10.13 n0.10.13
Michael Niedermayer [Mon, 9 Jun 2014 00:00:04 +0000 (02:00 +0200)]
update for 0.10.13

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 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 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/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/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 agoavcodec/wma: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sat, 5 Apr 2014 19:34:03 +0000 (21:34 +0200)]
avcodec/wma: use av_freep(), do not leave stale pointers in memory

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter...
Michael Niedermayer [Wed, 26 Mar 2014 17:09:23 +0000 (18:09 +0100)]
avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets

Fixes h264_mp4toannexb_bsf_failure.mkv

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 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: 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 agoMerge commit '9552b37e2604552d5ff210175d6baf28ccc2bb80' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:50:29 +0000 (02:50 +0200)]
Merge commit '9552b37e2604552d5ff210175d6baf28ccc2bb80' into release/0.10

* commit '9552b37e2604552d5ff210175d6baf28ccc2bb80':
  Add some bug references
  Update Changelog for 0.8.12
  Prepare for 0.8.12 Release

Conflicts:
Changelog
RELEASE

Not merged, as these changes are not correct for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:45:10 +0000 (02:45 +0200)]
Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10

* commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7':
  h264: set parameters from SPS whenever it changes
  alac: Limit max_samples_per_frame

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7fa72700298107fe756311ecb4dee5270ff12d35' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:41:16 +0000 (02:41 +0200)]
Merge commit '7fa72700298107fe756311ecb4dee5270ff12d35' into release/0.10

* commit '7fa72700298107fe756311ecb4dee5270ff12d35':
  swscale: Fix an undefined behaviour
  apedec: do not buffer decoded samples over AVPackets
  isom: lpcm in mov default to big endian

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:34:10 +0000 (02:34 +0200)]
Merge commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc' into release/0.10

* commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc':
  movdec: handle 0x7fff langcode as macintosh per the specs
  avi: Improve non-interleaved detection

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '079758e49a4d6b3e7cf2e22bed71d34c46712242' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:32:51 +0000 (02:32 +0200)]
Merge commit '079758e49a4d6b3e7cf2e22bed71d34c46712242' into release/0.10

* commit '079758e49a4d6b3e7cf2e22bed71d34c46712242':
  h264: reset next_output_pic earlier in start_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a0a90b1a1116250a2494021da810cc5da89ea36f' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:27:34 +0000 (02:27 +0200)]
Merge commit 'a0a90b1a1116250a2494021da810cc5da89ea36f' into release/0.10

* commit 'a0a90b1a1116250a2494021da810cc5da89ea36f':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fa60904ebd58da33abf10b05e9933d24619cf096' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:22:58 +0000 (02:22 +0200)]
Merge commit 'fa60904ebd58da33abf10b05e9933d24619cf096' into release/0.10

* commit 'fa60904ebd58da33abf10b05e9933d24619cf096':
  bytestream: add bytestream2_copy_buffer() functions
  bytestream: add functions for accessing size of buffer
  movenc: allow override of "writing application" tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '330c18032464a4e1f3da907e54db2e69a6fbfcda' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:18:16 +0000 (02:18 +0200)]
Merge commit '330c18032464a4e1f3da907e54db2e69a6fbfcda' into release/0.10

* commit '330c18032464a4e1f3da907e54db2e69a6fbfcda':
  matroskaenc: allow override of "writing application" tag
  avfilter: Add missing emms_c when needed
  mpeg12: check scantable indices in all decode_block functions

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10
Michael Niedermayer [Tue, 3 Jun 2014 00:14:02 +0000 (02:14 +0200)]
Merge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10

* commit '71b8c8430cf3f7056849257324fc39b423075ba1':
  sgidec: fix buffer size check in expand_rle_row()
  adx: check that the offset is not negative
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '27ac9585c97d35b809382be5634c8e5f7211243a' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:47:50 +0000 (01:47 +0200)]
Merge commit '27ac9585c97d35b809382be5634c8e5f7211243a' into release/0.10

* commit '27ac9585c97d35b809382be5634c8e5f7211243a':
  h264: reset data partitioning at the beginning of each decode call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '35ba079fbf281a066f3ac1e1271f3caa402dcd74' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:47:30 +0000 (01:47 +0200)]
Merge commit '35ba079fbf281a066f3ac1e1271f3caa402dcd74' into release/0.10

* commit '35ba079fbf281a066f3ac1e1271f3caa402dcd74':
  h264: reset ref count if decoding the slice header fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7cce9ebf3ae3b9678970236c964900393603a73' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:47:12 +0000 (01:47 +0200)]
Merge commit 'a7cce9ebf3ae3b9678970236c964900393603a73' into release/0.10

* commit 'a7cce9ebf3ae3b9678970236c964900393603a73':
  h264: reset first_field if frame_start() fails for missing refs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:46:55 +0000 (01:46 +0200)]
Merge commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9' into release/0.10

* commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:39:49 +0000 (01:39 +0200)]
Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10

* commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f33a24e824c6d20cb941e6b20c5382becfbc923' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:37:59 +0000 (01:37 +0200)]
Merge commit '7f33a24e824c6d20cb941e6b20c5382becfbc923' into release/0.10

* commit '7f33a24e824c6d20cb941e6b20c5382becfbc923':
  h264: check that execute_decode_slices() is not called too many times

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:37:12 +0000 (01:37 +0200)]
Merge commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d' into release/0.10

* commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d':
  h264: do not use 422 functions for monochrome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:27:23 +0000 (01:27 +0200)]
Merge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10

* commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0d8a17402b934b8fba7b86c6c990abf1257901b' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:27:08 +0000 (01:27 +0200)]
Merge commit 'e0d8a17402b934b8fba7b86c6c990abf1257901b' into release/0.10

* commit 'e0d8a17402b934b8fba7b86c6c990abf1257901b':
  h264_refs: make sure not to write over the bounds of the default ref list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2cbc8dfeddcbe00ef5f112162912bb49c1dd6623' into release/0.10
Michael Niedermayer [Mon, 2 Jun 2014 23:26:46 +0000 (01:26 +0200)]
Merge commit '2cbc8dfeddcbe00ef5f112162912bb49c1dd6623' into release/0.10

* commit '2cbc8dfeddcbe00ef5f112162912bb49c1dd6623':
  h264: check buffer size before accessing it
  configure: use utilities from /usr/xpg4/bin if it exists

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