ffmpeg.git
4 years agoconfigure: add noexecstack to linker options if supported.
Reimar Döffinger [Sun, 21 Sep 2014 08:58:10 +0000 (09:58 +0100)]
configure: add noexecstack to linker options if supported.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit b7082d953fda93f7841ffffe7d15a6c3cd15bdee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ac3enc_template: fix out of array read
Michael Niedermayer [Sat, 27 Sep 2014 18:34:44 +0000 (20:34 +0200)]
avcodec/ac3enc_template: fix out of array read

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/m4vdec: Check for non startcode 00 00 00 sequences in probe
Michael Niedermayer [Sun, 7 Sep 2014 14:39:39 +0000 (16:39 +0200)]
avformat/m4vdec: Check for non startcode 00 00 00 sequences in probe

Fixes miss detection of PCM as m4v
Fixes Ticket 3928

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: fix aac/ac3 parser bitstream buffer size
Michael Niedermayer [Thu, 21 Aug 2014 23:15:57 +0000 (01:15 +0200)]
avcodec: fix aac/ac3 parser bitstream buffer size

Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.

Based on patch by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fccd85b9f30525f88692f53134eba41f1f2d90db)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0e810255596070e2c503c5da9001f7087f71de6e' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 22:12:31 +0000 (23:12 +0100)]
Merge commit '0e810255596070e2c503c5da9001f7087f71de6e' into release/0.10

* commit '0e810255596070e2c503c5da9001f7087f71de6e':
  doc: More changelog updates for v0.8.17

Conflicts:
Changelog

not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '335ec616cc38ee6206a3acebd46d01aad73d721b' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 22:11:29 +0000 (23:11 +0100)]
Merge commit '335ec616cc38ee6206a3acebd46d01aad73d721b' into release/0.10

* commit '335ec616cc38ee6206a3acebd46d01aad73d721b':
  utvideodec: Handle slice_height being zero

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '76435f5e40854567252756ea7f788958dd2cc04c' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 22:09:55 +0000 (23:09 +0100)]
Merge commit '76435f5e40854567252756ea7f788958dd2cc04c' into release/0.10

* commit '76435f5e40854567252756ea7f788958dd2cc04c':
  doc: More changelog updates for v0.8.17

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ec5b2f6a385959048f780b4e7d3d259dc1fa8421' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:51:05 +0000 (22:51 +0100)]
Merge commit 'ec5b2f6a385959048f780b4e7d3d259dc1fa8421' into release/0.10

* commit 'ec5b2f6a385959048f780b4e7d3d259dc1fa8421':
  tiff: Check that there is no aliasing in pixel format selection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '82776caf7993221719eefbe576f851c7e52dfef9' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:50:45 +0000 (22:50 +0100)]
Merge commit '82776caf7993221719eefbe576f851c7e52dfef9' into release/0.10

* commit '82776caf7993221719eefbe576f851c7e52dfef9':
  rmenc: limit packet size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '905988fe1a8accbc1ab93120aa4cd29252b81cce' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:50:00 +0000 (22:50 +0100)]
Merge commit '905988fe1a8accbc1ab93120aa4cd29252b81cce' into release/0.10

* commit '905988fe1a8accbc1ab93120aa4cd29252b81cce':
  eamad: check for out of bounds read

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8b1f8fb26bfe6a4cd9f72b962b45643fa331dbe1' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:49:09 +0000 (22:49 +0100)]
Merge commit '8b1f8fb26bfe6a4cd9f72b962b45643fa331dbe1' into release/0.10

* commit '8b1f8fb26bfe6a4cd9f72b962b45643fa331dbe1':
  Update Changelog for 0.8.17 Release

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'aace8b184c867875e2715b2af23fa98886f90427' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:39:24 +0000 (22:39 +0100)]
Merge commit 'aace8b184c867875e2715b2af23fa98886f90427' into release/0.10

* commit 'aace8b184c867875e2715b2af23fa98886f90427':
  Prepare for 0.8.17 Release

Conflicts:
RELEASE

not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:37:34 +0000 (22:37 +0100)]
Merge commit 'd6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b' into release/0.10

* commit 'd6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b':
  h264_cabac: Break infinite loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '51dd54c51aaca909893c9f90a4119e96ff71ffdf' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:37:11 +0000 (22:37 +0100)]
Merge commit '51dd54c51aaca909893c9f90a4119e96ff71ffdf' into release/0.10

* commit '51dd54c51aaca909893c9f90a4119e96ff71ffdf':
  matroskadec: Fix read-after-free in matroska_read_seek()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9ae3cd6e7271a3d6b8cd92a4d35ebb16d2e03f1a' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:32:08 +0000 (22:32 +0100)]
Merge commit '9ae3cd6e7271a3d6b8cd92a4d35ebb16d2e03f1a' into release/0.10

* commit '9ae3cd6e7271a3d6b8cd92a4d35ebb16d2e03f1a':
  gifdec: refactor interleave end handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:31:54 +0000 (22:31 +0100)]
Merge commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423' into release/0.10

* commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423':
  smc: fix the bounds check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:31:40 +0000 (22:31 +0100)]
Merge commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454' into release/0.10

* commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454':
  mmvideo: check frame dimensions

Conflicts:
libavcodec/mmvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:20:49 +0000 (22:20 +0100)]
Merge commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a' into release/0.10

* commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a':
  jvdec: check frame dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:20:28 +0000 (22:20 +0100)]
Merge commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48' into release/0.10

* commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48':
  mov: avoid a memleak when multiple stss boxes are present

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '22103315c2a1cb2de336750c50cf6bf7c109220c' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:19:30 +0000 (22:19 +0100)]
Merge commit '22103315c2a1cb2de336750c50cf6bf7c109220c' into release/0.10

* commit '22103315c2a1cb2de336750c50cf6bf7c109220c':
  Add some bug references to the changelog

Conflicts:
Changelog

not merged as this isnt the FFmpeg Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b989bb7adee0f3286dcaa63c5cd0753eac45f6be' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:05:00 +0000 (22:05 +0100)]
Merge commit 'b989bb7adee0f3286dcaa63c5cd0753eac45f6be' into release/0.10

* commit 'b989bb7adee0f3286dcaa63c5cd0753eac45f6be':
  apetag: Fix APE tag size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '893b353362bc220280efd8d14c4878a1cafe18a8' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:04:41 +0000 (22:04 +0100)]
Merge commit '893b353362bc220280efd8d14c4878a1cafe18a8' into release/0.10

* commit '893b353362bc220280efd8d14c4878a1cafe18a8':
  x86: Only use optimizations with cmov if the CPU supports the instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 21:04:04 +0000 (22:04 +0100)]
Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10

* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa':
  x86: Add CPU flag for the i686 cmov instruction

Conflicts:
doc/APIchanges
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c6af9e944ebeb336f6520f59afaebb62392fb026' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:55:54 +0000 (21:55 +0100)]
Merge commit 'c6af9e944ebeb336f6520f59afaebb62392fb026' into release/0.10

* commit 'c6af9e944ebeb336f6520f59afaebb62392fb026':
  Update Changelog for v0.8.16
  Prepare for 0.8.16 release
  Update Changelog for v0.8.15

Conflicts:
Changelog
RELEASE

not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:54:41 +0000 (21:54 +0100)]
Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10

* commit 'f661006f235fa58bc756610cdc76c662ac0fab5f':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
doc/avconv.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '554fd5cd630073b8273aa044a6bdfd6f608209e9' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:50:29 +0000 (21:50 +0100)]
Merge commit '554fd5cd630073b8273aa044a6bdfd6f608209e9' into release/0.10

* commit '554fd5cd630073b8273aa044a6bdfd6f608209e9':
  ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2deac60a387409dcbc7b37a8c30de89c7aeb58ac' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:49:59 +0000 (21:49 +0100)]
Merge commit '2deac60a387409dcbc7b37a8c30de89c7aeb58ac' into release/0.10

* commit '2deac60a387409dcbc7b37a8c30de89c7aeb58ac':
  adpcmenc: Calculate the IMA_QT predictor without overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3eed35addb461c42471e0367bb6cd68d8ffd3aec' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:49:26 +0000 (21:49 +0100)]
Merge commit '3eed35addb461c42471e0367bb6cd68d8ffd3aec' into release/0.10

* commit '3eed35addb461c42471e0367bb6cd68d8ffd3aec':
  svq1enc: Set picture_structure correctly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ec0df23765bd41846f66e4a4fb694779b432fc62' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:44:20 +0000 (21:44 +0100)]
Merge commit 'ec0df23765bd41846f66e4a4fb694779b432fc62' into release/0.10

* commit 'ec0df23765bd41846f66e4a4fb694779b432fc62':
  h264: Remove an assert on current_picture_ptr being null

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '372f742dd18911dc5c6552b1bb2e2ca235c5ee47' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:44:05 +0000 (21:44 +0100)]
Merge commit '372f742dd18911dc5c6552b1bb2e2ca235c5ee47' into release/0.10

* commit '372f742dd18911dc5c6552b1bb2e2ca235c5ee47':
  parser: Don't use pc as context for av_dlog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd1c490448cbe3f7715773c673e92139a7192326f' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:43:36 +0000 (21:43 +0100)]
Merge commit 'd1c490448cbe3f7715773c673e92139a7192326f' into release/0.10

* commit 'd1c490448cbe3f7715773c673e92139a7192326f':
  mpegvideo: remove last_picture_ptr / h264 assert.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9858a723cbcb206287fd0232d74c6a0991eecdc8' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:37:43 +0000 (21:37 +0100)]
Merge commit '9858a723cbcb206287fd0232d74c6a0991eecdc8' into release/0.10

* commit '9858a723cbcb206287fd0232d74c6a0991eecdc8':
  elbg: Fix an assert

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:36:47 +0000 (21:36 +0100)]
Merge commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35' into release/0.10

* commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35':
  swscale: Remove two bogus asserts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '233d1b4861e252cbc4571840e7f264e1db151c13' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:36:28 +0000 (21:36 +0100)]
Merge commit '233d1b4861e252cbc4571840e7f264e1db151c13' into release/0.10

* commit '233d1b4861e252cbc4571840e7f264e1db151c13':
  h264_refs: Fix debug tprintf argument types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '90a2359fef5325f90aec0eca51b145d90ca3df7d' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:32:04 +0000 (21:32 +0100)]
Merge commit '90a2359fef5325f90aec0eca51b145d90ca3df7d' into release/0.10

* commit '90a2359fef5325f90aec0eca51b145d90ca3df7d':
  nutdec: Remove unused and broken debug function stub

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '57c36de7265761dd94fb6bb4a9180011f796128f' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:29:31 +0000 (21:29 +0100)]
Merge commit '57c36de7265761dd94fb6bb4a9180011f796128f' into release/0.10

* commit '57c36de7265761dd94fb6bb4a9180011f796128f':
  vp8: avoid race condition on segment map.

Conflicts:
libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8152b02f33a7b939cb2c9a5f26d10cd10465d4f9' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:10:46 +0000 (21:10 +0100)]
Merge commit '8152b02f33a7b939cb2c9a5f26d10cd10465d4f9' into release/0.10

* commit '8152b02f33a7b939cb2c9a5f26d10cd10465d4f9':
  arm/neon: dsputil: use correct size specifiers on vld1/vst1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:10:27 +0000 (21:10 +0100)]
Merge commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d' into release/0.10

* commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d':
  arm: dsputil: prettify some conditional instructions in put_pixels macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6dd19ffd39babd651744082301d133264a30882c' into release/0.10
Michael Niedermayer [Wed, 11 Mar 2015 20:10:03 +0000 (21:10 +0100)]
Merge commit '6dd19ffd39babd651744082301d133264a30882c' into release/0.10

* commit '6dd19ffd39babd651744082301d133264a30882c':
  arm: dsputil: fix overreads in put/avg_pixels functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: More changelog updates for v0.8.17
Reinhard Tartler [Tue, 10 Mar 2015 02:11:14 +0000 (22:11 -0400)]
doc: More changelog updates for v0.8.17

4 years agoutvideodec: Handle slice_height being zero
Michael Niedermayer [Wed, 4 Mar 2015 17:36:14 +0000 (17:36 +0000)]
utvideodec: Handle slice_height being zero

Fixes out of array accesses.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-9604
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d)
(cherry picked from commit 3a417a86b330b7c1acf9db4f729be7d619caaded)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e032e647dd79e7748145792dfee0358eccb1982e)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 789f433bc6376e6e45d41ae491007d482fa1df85)

Conflicts:
libavcodec/utvideodec.c

4 years agodoc: More changelog updates for v0.8.17
Reinhard Tartler [Mon, 9 Mar 2015 02:34:43 +0000 (22:34 -0400)]
doc: More changelog updates for v0.8.17

4 years agotiff: Check that there is no aliasing in pixel format selection
Anton Khirnov [Sat, 7 Mar 2015 21:06:59 +0000 (22:06 +0100)]
tiff: Check that there is no aliasing in pixel format selection

Fixes possible issues with unexpected bpp/bppcount values.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-8544
(cherry picked from commit ae5e1f3d663a8c9a532d89e588cbc61f171c9186)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit eb9041403d820634c45ed4ee98570246a252507a)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 62b0462e5fa78901380ca229ddb6a7625efd61a2)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
4 years agormenc: limit packet size
Andreas Cadhalpun [Mon, 2 Mar 2015 15:52:26 +0000 (16:52 +0100)]
rmenc: limit packet size

The chunk size is limited to UINT16_MAX (written by avio_wb16), so make
sure that the packet size is not too large.

Such large frames need to be split into slices smaller than 64 kB, but
that is currently supported neither by the rv10/rv20 encoders nor the rm
muxer.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoeamad: check for out of bounds read
Federico Tomassetti [Wed, 18 Feb 2015 12:11:44 +0000 (12:11 +0000)]
eamad: check for out of bounds read

Bug-Id: CID 1257500
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoUpdate Changelog for 0.8.17 Release
Reinhard Tartler [Sun, 8 Mar 2015 15:32:09 +0000 (11:32 -0400)]
Update Changelog for 0.8.17 Release

4 years agoPrepare for 0.8.17 Release
Reinhard Tartler [Sun, 8 Mar 2015 15:29:56 +0000 (11:29 -0400)]
Prepare for 0.8.17 Release

4 years agoh264_cabac: Break infinite loops
Michael Niedermayer [Thu, 31 Jan 2013 03:20:24 +0000 (04:20 +0100)]
h264_cabac: Break infinite loops

This fixes out of array reads and/or infinite loops.

30 is the maximum number of bits that can be read into
coeff_abs below.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomatroskadec: Fix read-after-free in matroska_read_seek()
Xiaohan Wang [Thu, 6 Nov 2014 20:59:54 +0000 (12:59 -0800)]
matroskadec: Fix read-after-free in matroska_read_seek()

In matroska_read_seek(), |tracks| is assigned at the begining of the
function. However, functions like matroska_parse_cues() could reallocate
the tracks and invalidate |tracks|.

This assigns |tracks| only before using it, so that it will not get
invalidated elsewhere.

Bug-Id: chromium/427266

4 years agogifdec: refactor interleave end handling
Michael Niedermayer [Fri, 3 Oct 2014 18:15:52 +0000 (20:15 +0200)]
gifdec: refactor interleave end handling

Fixes invalid writes with very small image heights.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8547
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 0b39ac6f54505a538c21fe49a626de94c518c903)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit eac49477aa95cf727d87d2741ee8e60be59d394b)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 92888e9ed4ea4e761ae953bbe28c85cc658abc8f)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 02de44073a8e116ea177b53081219d32ef135ad8)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agosmc: fix the bounds check
Michael Niedermayer [Fri, 3 Oct 2014 20:50:45 +0000 (22:50 +0200)]
smc: fix the bounds check

Fixes invalid writes when there are more blocks in a run than total
remaining blocks.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8548
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit d423dd72be451462c6fb1cbbe313bed0194001ab)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 58dc526ebf722d33bf09275c1241674e0e6b9ef1)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit f249e9889155599ee3ad0172832d38f68b0c625d)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 306ee95088243fefa2dfcb5c355d439db75e2d2a)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agommvideo: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
mmvideo: check frame dimensions

The frame size must be set by the caller and each dimension must be a
multiple of 2.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8543
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 17ba719d9ba30c970f65747f42d5fbb1e447ca28)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 69a930b988ff4f88ae27e4fc24ff6ed116840b5e)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 3f10a779b465fd22d3aec1b744ca8544bc2da970)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavcodec/mmvideo.c

(cherry picked from commit 03dba25a4001495226651068232b4c6b1e75fd02)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agojvdec: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
jvdec: check frame dimensions

The frame size must be set by the caller and each dimension must be a
multiple of 8.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8542
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 88626e5af8d006e67189bf10b96b982502a7e8ad)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 55788572ea7b89cdd77bab1cf4bf06d14ead34f5)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 8f238dd9bdd9eba569fcaa564a07fbdd89412a14)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavcodec/jvdec.c

(cherry picked from commit 50cb695bf124b0bd4d9e2b3c1bfdd08b35b14438)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavcodec/jvdec.c

4 years agomov: avoid a memleak when multiple stss boxes are present
Anton Khirnov [Tue, 12 Aug 2014 14:39:10 +0000 (14:39 +0000)]
mov: avoid a memleak when multiple stss boxes are present

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 64f7575fbd64e5b65d5c644347408588c776f1fe)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 577f1feb3fd1e51fd14af7ce6d79d468faa3b929)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 931f5b235112f1c2a09dead36f0a228061d23942)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 93f919d0b4c4341ccee366c98ac9af813f8fe622)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoAdd some bug references to the changelog
Diego Biurrun [Tue, 16 Sep 2014 10:28:45 +0000 (03:28 -0700)]
Add some bug references to the changelog

5 years agoapetag: Fix APE tag size check
Katerina Barone-Adesi [Mon, 15 Sep 2014 23:40:24 +0000 (01:40 +0200)]
apetag: Fix APE tag size check

The size variable is (correctly) unsigned, but is passed to several functions
which take signed parameters, such as avio_read, sometimes after having
numbers added to it. So ensure that size remains within the bounds that
these functions can handle.

(cherry picked from commit 56ac2cbd0464e0146e62c91843e2b1f5e0908504)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavformat/apetag.c

5 years agox86: Only use optimizations with cmov if the CPU supports the instruction
Diego Biurrun [Tue, 19 Jun 2012 10:55:10 +0000 (12:55 +0200)]
x86: Only use optimizations with cmov if the CPU supports the instruction

Also fill in missing hash for AV_CPU_FLAG_CMOV addition in APIChanges.

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

5 years agox86: Add CPU flag for the i686 cmov instruction
Diego Biurrun [Tue, 19 Jun 2012 20:55:26 +0000 (22:55 +0200)]
x86: Add CPU flag for the i686 cmov instruction

(cherry picked from commit 65345a5a30a0e866b6944c0e6184be3feca04335)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavutil/cpu.c
libavutil/cpu.h

5 years agoUpdate Changelog for v0.8.16
Diego Biurrun [Wed, 10 Sep 2014 19:46:05 +0000 (12:46 -0700)]
Update Changelog for v0.8.16

5 years agoPrepare for 0.8.16 release
Diego Biurrun [Wed, 10 Sep 2014 19:43:08 +0000 (12:43 -0700)]
Prepare for 0.8.16 release

5 years agoUpdate Changelog for v0.8.15
Diego Biurrun [Wed, 10 Sep 2014 19:42:12 +0000 (12:42 -0700)]
Update Changelog for v0.8.15

5 years agodoc: Fix syntax and logical errors in avconv stream combination example
Diego Biurrun [Wed, 10 Sep 2014 16:38:15 +0000 (18:38 +0200)]
doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org
(cherry picked from commit 775a0b04f0cf8102fe322b2ee03fe1a0633dea04)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoffmpeg: Clarify wording of ffmpeg --> avconv deprecation message
Diego Biurrun [Wed, 20 Aug 2014 17:50:33 +0000 (10:50 -0700)]
ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message

5 years agoadpcmenc: Calculate the IMA_QT predictor without overflow
Michael Niedermayer [Tue, 4 Sep 2012 11:02:30 +0000 (14:02 +0300)]
adpcmenc: Calculate the IMA_QT predictor without overflow

Previously, the value given to put_bits was 10 bits long for positive
predictors, even though 9 bits were to be written. The extra bit could
in some cases overwrite existing bits in the bitstream writer cache.

This fixes a failed assert in put_bits.h, when running a version
built with -DDEBUG.

The fate test result gets slightly improved, thanks to getting rid
of the overwritten bits in the bitstream writer cache.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit aa264da5bf6a3d82a47abba4cfcfa629dd1f3daa)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
tests/ref/fate/acodec-adpcm-ima_qt

5 years agosvq1enc: Set picture_structure correctly
Michael Niedermayer [Mon, 6 Aug 2012 14:28:13 +0000 (16:28 +0200)]
svq1enc: Set picture_structure correctly

This fixes assert failures when running in debug mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 2d7d91f06d6a1d243dc74c96d3389ee237a3b906)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoh264: Remove an assert on current_picture_ptr being null
Michael Niedermayer [Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)]
h264: Remove an assert on current_picture_ptr being null

It is possible in various error paths as well as gap handling
that this has already been allocated. It is not clear why that
would be a problem with the current code, thus disable the
assert to avoid a common assert failure when asserts are enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 5e997688f8801bb89c773f368237627d957fa520)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoparser: Don't use pc as context for av_dlog
Martin Storsjö [Tue, 4 Sep 2012 11:45:00 +0000 (14:45 +0300)]
parser: Don't use pc as context for av_dlog

The ParserContext class doesn't have an AVClass, required for
using it as a logging class.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6d65496990dcac551f60668c2418a50a3111c86c)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agompegvideo: remove last_picture_ptr / h264 assert.
Michael Niedermayer [Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)]
mpegvideo: remove last_picture_ptr / h264 assert.

This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 91672504a403556f63492093b892574234f21dd7)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavcodec/mpegvideo.c

5 years agoelbg: Fix an assert
Michael Niedermayer [Sat, 18 Aug 2012 19:53:32 +0000 (21:53 +0200)]
elbg: Fix an assert

It seems the condition was flipped from what was intended.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 2c340596cab981ac842aff7da89d298025c99304)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoswscale: Remove two bogus asserts
Diego Biurrun [Tue, 11 Sep 2012 20:11:25 +0000 (22:11 +0200)]
swscale: Remove two bogus asserts

(cherry picked from commit b9141aa346b736adffd27e1a98bd12aa7b628a8f)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libswscale/swscale.c

5 years agoh264_refs: Fix debug tprintf argument types
Diego Biurrun [Tue, 25 Sep 2012 17:05:26 +0000 (19:05 +0200)]
h264_refs: Fix debug tprintf argument types

(cherry picked from commit 6c5b0517e00fc22753c5cc0751cba186dd71ed36)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agonutdec: Remove unused and broken debug function stub
Diego Biurrun [Tue, 25 Sep 2012 17:01:10 +0000 (19:01 +0200)]
nutdec: Remove unused and broken debug function stub

(cherry picked from commit 83655442fa6dbf7578d108ce479f98a14ebb3e3c)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavformat/nutdec.c

5 years agovp8: avoid race condition on segment map.
Aaron Colwell [Mon, 19 Mar 2012 03:03:00 +0000 (20:03 -0700)]
vp8: avoid race condition on segment map.

This change avoids accessing the segment map of the previous frame if
segmentation is not enabled for the current frame. The caller of
decode_mb_mode() only calls ff_thread_await_progress() on the reference
segmentation index array if segmentation is enabled, so Chromium's TSAN
will report a race when accessing this data while segmentation is not
enabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 30011bf20109eef1a0f9ee949b19f9998ad88663)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoarm/neon: dsputil: use correct size specifiers on vld1/vst1
Mans Rullgard [Thu, 10 May 2012 16:40:30 +0000 (17:40 +0100)]
arm/neon: dsputil: use correct size specifiers on vld1/vst1

Change the size specifiers to match the actual element sizes
of the data.  This makes no practical difference with strict
alignment checking disabled (the default) other than somewhat
documenting the code.  With strict alignment checking on, it
avoids trapping the unaligned loads.

Signed-off-by: Mans Rullgard <mans@mansr.com>
5 years agoarm: dsputil: prettify some conditional instructions in put_pixels macros
Mans Rullgard [Thu, 10 May 2012 15:24:33 +0000 (16:24 +0100)]
arm: dsputil: prettify some conditional instructions in put_pixels macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
5 years agoarm: dsputil: fix overreads in put/avg_pixels functions
Mans Rullgard [Wed, 9 May 2012 23:55:18 +0000 (00:55 +0100)]
arm: dsputil: fix overreads in put/avg_pixels functions

The vertically interpolating variants of these functions read
ahead one line to optimise the loop.  On the last line processed,
this might be outside the buffer.  Fix these invalid reads by
processing the last line outside the loop.

Signed-off-by: Mans Rullgard <mans@mansr.com>
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>