ffmpeg.git
6 years agoUpdate for 1.1.5 n1.1.5
Michael Niedermayer [Sun, 12 May 2013 22:59:36 +0000 (00:59 +0200)]
Update for 1.1.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogifdec: check that the last keyframe exists and has been successfully parsed.
Michael Niedermayer [Thu, 24 Jan 2013 03:17:58 +0000 (04:17 +0100)]
gifdec: check that the last keyframe exists and has been successfully parsed.

Prevents inconsistent state and null pointer dereference

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

Conflicts:

libavcodec/gifdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogifdec: reset previous Graphic Control Extension disposal type
Michael Niedermayer [Tue, 7 May 2013 14:07:27 +0000 (16:07 +0200)]
gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

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

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

Conflicts:

libavcodec/gifdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/cdgraphics: check buffer size before use
Michael Niedermayer [Tue, 7 May 2013 19:04:33 +0000 (21:04 +0200)]
avcodec/cdgraphics: check buffer size before use

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: Check dimensions before use
Michael Niedermayer [Tue, 7 May 2013 19:58:27 +0000 (21:58 +0200)]
sanm: Check dimensions before use

Fixes integer overflow and out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: avtool -> fftool
Clément Bœsch [Sun, 31 Mar 2013 12:49:14 +0000 (14:49 +0200)]
cmdutils: avtool -> fftool
(cherry picked from commit 7d8ad6c1fa11ec548fc63427656989e0e7c6af8b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/intfloat_readwrite: include common.h for isinf()
Michael Niedermayer [Wed, 17 Apr 2013 21:16:05 +0000 (23:16 +0200)]
avutil/intfloat_readwrite: include common.h for isinf()

Solution based on rational.c, which uses isinf() too

This should fix compilation with msvc

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()
Michael Niedermayer [Wed, 17 Apr 2013 18:40:56 +0000 (20:40 +0200)]
avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()

Should fix pgc warning

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/log: Fix context pointer used for get_category()
Michael Niedermayer [Tue, 30 Apr 2013 18:05:31 +0000 (20:05 +0200)]
avutil/log: Fix context pointer used for get_category()

Fixes calling a random pointer

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovmdav: Try to fix unpack_rle()
Michael Niedermayer [Wed, 1 May 2013 21:46:38 +0000 (23:46 +0200)]
vmdav: Try to fix unpack_rle()

This fixes out of array accesses
The code prior to this commit could not have worked, thus obviously
was untested. I was also not able to find a valid sample that uses this
code.
This fix is thus only based on the description of the format

If someone has a sample that uses unpack_rle(), please mail me.

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

Conflicts:

libavcodec/vmdav.c

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agommvideo/mm_decode_intra: check horizontal coordinate too
Michael Niedermayer [Thu, 2 May 2013 20:06:03 +0000 (22:06 +0200)]
mmvideo/mm_decode_intra: check horizontal coordinate too

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agommvideo/mm_decode_inter: check horizontal coordinate too
Michael Niedermayer [Thu, 2 May 2013 19:52:08 +0000 (21:52 +0200)]
mmvideo/mm_decode_inter: check horizontal coordinate too

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: fix overlapping memcpy with upscale_v
Michael Niedermayer [Tue, 16 Apr 2013 17:53:24 +0000 (19:53 +0200)]
mjpegdec: fix overlapping memcpy with upscale_v

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: Fix edge emu with lowres
Michael Niedermayer [Tue, 7 May 2013 23:18:56 +0000 (01:18 +0200)]
avcodec/mpegvideo: Fix edge emu with lowres

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks
Michael Niedermayer [Tue, 7 May 2013 23:17:45 +0000 (01:17 +0200)]
avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks

Fixes green trash
Fixes part of Ticket2535

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosrc_movie: fix scanf string
Michael Niedermayer [Sat, 4 May 2013 22:56:39 +0000 (00:56 +0200)]
src_movie: fix scanf string

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxbmdec: fix off by one error in scanf()
Michael Niedermayer [Sat, 4 May 2013 22:23:13 +0000 (00:23 +0200)]
xbmdec: fix off by one error in scanf()

Fixes out of array access

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/release/9' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 12:39:09 +0000 (14:39 +0200)]
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  update Changelog
  af_asyncts: fix offset calculation
  oma: properly forward errors in oma_read_packet
  indeo3: use unaligned reads on reference blocks.

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 12:31:59 +0000 (14:31 +0200)]
Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

* commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb':
  lavc: Fix assignments in if() when calling ff_af_queue_add
  wav: Always seek to an even offset
  swscale: Use alpha from the right row in yuva2rgba_c
  Prepare for 9.6 Release

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 12:24:09 +0000 (14:24 +0200)]
Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1

* commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab':
  hls, segment: fix splitting for audio-only streams.
  afifo: fix request_samples on the last frame in certain cases
  id3v2: check for end of file while unescaping tags
  indeo3: fix off by one in MV validity check

Conflicts:
libavformat/id3v2.c
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 12:11:03 +0000 (14:11 +0200)]
Merge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1

* commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37':
  aac: check the maximum number of channels
  update Changelog
  riff: check for eof if chunk size and code are 0
  oggdec: fix faulty cleanup prototype

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 11:55:06 +0000 (13:55 +0200)]
Merge commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3' into release/1.1

* commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3':
  mp3dec: fallback to generic seeking when a TOC is not present
  svq1dec: clip motion vectors to the frame size.
  svq1dec: check that the reference frame has the same dimensions as the current one
  qdm2: check that the FFT size is a power of 2

Conflicts:
libavcodec/svq1dec.c
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 11:44:08 +0000 (13:44 +0200)]
Merge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1

* commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54':
  indeo3: switch parsing the header to bytestream2
  indeo3: check motion vectors.
  rv10: check that extradata is large enough
  indeo3: fix data size check

Conflicts:
libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8f558c3e101859aec9adcb4b4b270ae1ef8f88b5' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 11:35:30 +0000 (13:35 +0200)]
Merge commit '8f558c3e101859aec9adcb4b4b270ae1ef8f88b5' into release/1.1

* commit '8f558c3e101859aec9adcb4b4b270ae1ef8f88b5':
  af_channelmap: sanity check input channel indices in all cases.
  id3v2: pad the APIC packets as required by lavc.
  lavf: make sure stream probe data gets freed.
  dfa: check for invalid access in decode_wdlt().

Conflicts:
libavformat/id3v2.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '858864d350320dd807e349bda017026e61a47fe0' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 11:19:54 +0000 (13:19 +0200)]
Merge commit '858864d350320dd807e349bda017026e61a47fe0' into release/1.1

* commit '858864d350320dd807e349bda017026e61a47fe0':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().
  xmv: do not leak memory in the error paths in xmv_read_header()
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
libavformat/matroskadec.c
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 11:05:14 +0000 (13:05 +0200)]
Merge commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1' into release/1.1

* commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1':
  matroska: Update the available size after lace parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 10:49:36 +0000 (12:49 +0200)]
Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1

* commit '05015d03da1d745bb92915b5cea92dec16af719f':
  matroska: fix a corner case in ebml-lace parsing
  avfiltergraph: check for sws opts being non-NULL before using them.
  configure: Enable hwaccels without external dependencies by default.
  oma: Validate sample rates

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/oma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fc6825ebb6585138e8ee2bb3484a04542c5d8b6a' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 10:41:03 +0000 (12:41 +0200)]
Merge commit 'fc6825ebb6585138e8ee2bb3484a04542c5d8b6a' into release/1.1

* commit 'fc6825ebb6585138e8ee2bb3484a04542c5d8b6a':
  vp8: Fix pthread_cond and pthread_mutex leaks
  configure: Refactor dxva2api.h dependency declarations
  flvdec: read audio sample size and channels metadata
  flvdec: use the correct audio codec id when parsing metadata

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 10:02:26 +0000 (12:02 +0200)]
Merge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1

* commit '2e06758479650f6e2a8820c7105f2d193a701175':
  Prepare for 9.5 Release
  update Changelog
  add missed CVE reference in 9.2 release
  fate: fetch samples that match the release series

Conflicts:
Changelog
RELEASE
tests/Makefile

The rsync change is not merged
We need to maintain the ability to checkout and test old revissions
from master. This implies that the default sample repository has the
needed samples for both older and newer revissions. Thus there is no
need for a seperate one for each release.
Comments & Suggestions of course welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '31a77177ff323ef83944c60a8654891213ab6691' into release/1.1
Michael Niedermayer [Sun, 12 May 2013 09:21:41 +0000 (11:21 +0200)]
Merge commit '31a77177ff323ef83944c60a8654891213ab6691' into release/1.1

* commit '31a77177ff323ef83944c60a8654891213ab6691':
  iff: validate CMAP palette size

Conflicts:
libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoupdate Changelog
Reinhard Tartler [Sat, 11 May 2013 09:51:47 +0000 (11:51 +0200)]
update Changelog

6 years agoaf_asyncts: fix offset calculation
Anton Khirnov [Wed, 8 May 2013 19:44:20 +0000 (21:44 +0200)]
af_asyncts: fix offset calculation

delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agooma: properly forward errors in oma_read_packet
Luca Barbato [Tue, 7 May 2013 07:39:10 +0000 (09:39 +0200)]
oma: properly forward errors in oma_read_packet

Prevent spurios EIO on EOF.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoindeo3: use unaligned reads on reference blocks.
Anton Khirnov [Sat, 4 May 2013 07:51:17 +0000 (09:51 +0200)]
indeo3: use unaligned reads on reference blocks.

They are not guaranteed to be aligned.
Fixes Bug 503.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agolavc: Fix assignments in if() when calling ff_af_queue_add
Michael Niedermayer [Sun, 13 Jan 2013 23:02:50 +0000 (00:02 +0100)]
lavc: Fix assignments in if() when calling ff_af_queue_add

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1d7ffd06e41e44d8932d0dd62caa2da17947d8c4)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agowav: Always seek to an even offset
Luca Barbato [Sat, 4 May 2013 10:18:57 +0000 (12:18 +0200)]
wav: Always seek to an even offset

RIFF chunks are aligned to 16bit according to the specification.

Bug-Id:500
CC:libav-stable@libav.org
(cherry picked from commit ac87eaf856e0fb51917266b899bb15d19b907baf)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agomatroska: set "done" only during resync fail.
Reimar Döffinger [Sun, 5 May 2013 07:46:37 +0000 (09:46 +0200)]
matroska: set "done" only during resync fail.

Fixes playback of test7.mkv validation test file.

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

6 years agoswscale: Use alpha from the right row in yuva2rgba_c
Martin Storsjö [Mon, 6 May 2013 11:48:25 +0000 (14:48 +0300)]
swscale: Use alpha from the right row in yuva2rgba_c

Every other pixel had the alpha channel taken from the wrong
row.

This fixes bug 504.

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

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoFix type of shared flac table ff_flac_blocksize_table[].
Carl Eugen Hoyos [Sun, 5 May 2013 17:29:00 +0000 (19:29 +0200)]
Fix type of shared flac table ff_flac_blocksize_table[].

Fixes ticket #2533.
(cherry picked from commit a07ac1f7888fd08e42da2bed0421e74f1cfac177)

6 years agoPrepare for 9.6 Release
Reinhard Tartler [Sat, 4 May 2013 08:54:20 +0000 (10:54 +0200)]
Prepare for 9.6 Release

6 years agohls, segment: fix splitting for audio-only streams.
Anton Khirnov [Fri, 26 Apr 2013 07:54:59 +0000 (09:54 +0200)]
hls, segment: fix splitting for audio-only streams.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoafifo: fix request_samples on the last frame in certain cases
Anton Khirnov [Tue, 16 Apr 2013 19:53:56 +0000 (21:53 +0200)]
afifo: fix request_samples on the last frame in certain cases

The current code can fail to return the last frame if it contains
exactly the requested number of samples.

Fixes the join filter test, which previously did not include the last
408 samples in most cases.

CC:libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavfilter/fifo.c
tests/fate/filter-audio.mak

6 years agoid3v2: check for end of file while unescaping tags
Luca Barbato [Wed, 1 May 2013 17:01:11 +0000 (19:01 +0200)]
id3v2: check for end of file while unescaping tags

Prevent an out of buffer bound write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit af4cc2605c7a56ecfd84c264aa2b325020418472)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoindeo3: fix off by one in MV validity check
Anton Khirnov [Sat, 27 Apr 2013 16:01:51 +0000 (18:01 +0200)]
indeo3: fix off by one in MV validity check

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

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoaac: check the maximum number of channels
Luca Barbato [Sat, 27 Apr 2013 16:20:47 +0000 (18:20 +0200)]
aac: check the maximum number of channels

Broken bitstreams could report a larger than specified number of
channels and cause outbound writes.

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

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoupdate Changelog
Reinhard Tartler [Sun, 21 Apr 2013 16:51:33 +0000 (18:51 +0200)]
update Changelog

6 years agoriff: check for eof if chunk size and code are 0
Luca Barbato [Sat, 20 Apr 2013 11:36:44 +0000 (13:36 +0200)]
riff: check for eof if chunk size and code are 0

Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 8e329dba378cef0ff6400c7df9c51da167d5a1f0)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agooggdec: fix faulty cleanup prototype
Luca Barbato [Wed, 9 Jan 2013 19:49:34 +0000 (20:49 +0100)]
oggdec: fix faulty cleanup prototype

(cherry picked from commit fba8e5b608577fc660989d0057a55818254a3744)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agomp3dec: fallback to generic seeking when a TOC is not present
Michael Niedermayer [Thu, 20 Sep 2012 20:00:52 +0000 (22:00 +0200)]
mp3dec: fallback to generic seeking when a TOC is not present

Fixes seeking without a Xing/Info header.

CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 505642f18276aed03278ac91b1f334ea888eac6a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agosvq1dec: clip motion vectors to the frame size.
Anton Khirnov [Mon, 8 Apr 2013 20:15:54 +0000 (22:15 +0200)]
svq1dec: clip motion vectors to the frame size.

Fixes invalid reads for corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit ecff5acb5a738fcb4f9e206a12070dac4bf259b3)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agosvq1dec: check that the reference frame has the same dimensions as the current one
Anton Khirnov [Mon, 8 Apr 2013 20:12:12 +0000 (22:12 +0200)]
svq1dec: check that the reference frame has the same dimensions as the current one

They can be different if the last keyframe failed to decode correctly.
Fixes possible invalid reads in such a case.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit b1bb8fb860b47e90dd67f0c5740698128fc82dcc)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoqdm2: check that the FFT size is a power of 2
Anton Khirnov [Tue, 9 Apr 2013 13:25:20 +0000 (15:25 +0200)]
qdm2: check that the FFT size is a power of 2

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit 34f87a58532ed652a6e0283c1d044ee5df0aef0b)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoindeo3: switch parsing the header to bytestream2
Anton Khirnov [Wed, 10 Apr 2013 07:40:20 +0000 (09:40 +0200)]
indeo3: switch parsing the header to bytestream2

Also add an additional sanity check to the alt_quant table.
Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit 66531d634e75b834e89e4a6a0f7470ca018712a1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoindeo3: check motion vectors.
Anton Khirnov [Tue, 16 Apr 2013 07:41:28 +0000 (09:41 +0200)]
indeo3: check motion vectors.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit a0a872d0733f60876b0c93f236bc4606f36fbf89)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agorv10: check that extradata is large enough
Anton Khirnov [Tue, 9 Apr 2013 18:33:25 +0000 (20:33 +0200)]
rv10: check that extradata is large enough

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

(cherry picked from commit 01d376f598fe95478036f5d1e3e5e14ffe32d4bf)

Conflicts:

libavcodec/rv10.c

6 years agoindeo3: fix data size check
Anton Khirnov [Wed, 10 Apr 2013 07:59:36 +0000 (09:59 +0200)]
indeo3: fix data size check

The data offsets are relative to the bistream header, which is 16 bytes
after the start of the data.
Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit 34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoaf_channelmap: sanity check input channel indices in all cases.
Anton Khirnov [Sun, 14 Apr 2013 10:07:24 +0000 (12:07 +0200)]
af_channelmap: sanity check input channel indices in all cases.

Fixes invalid reads from non-existing channels.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoid3v2: pad the APIC packets as required by lavc.
Anton Khirnov [Thu, 28 Mar 2013 08:49:38 +0000 (09:49 +0100)]
id3v2: pad the APIC packets as required by lavc.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agolavf: make sure stream probe data gets freed.
Anton Khirnov [Wed, 27 Mar 2013 16:56:59 +0000 (17:56 +0100)]
lavf: make sure stream probe data gets freed.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit dbb1425811a672eddf4acf0513237cdf20f83756)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agodfa: check for invalid access in decode_wdlt().
Anton Khirnov [Wed, 27 Mar 2013 17:18:38 +0000 (18:18 +0100)]
dfa: check for invalid access in decode_wdlt().

This can happen when the number of skipped lines is not consistent with
the number of coded lines.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3623589edc7b1257bb45aa9e52c9631e133f22b6)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoxmv: check audio track parameters validity.
Anton Khirnov [Thu, 28 Mar 2013 09:33:02 +0000 (10:33 +0100)]
xmv: check audio track parameters validity.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit d1016dccdcb10486245e5d7c186cc31af54b2a9c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agobmv: check for len being valid in bmv_decode_frame().
Anton Khirnov [Thu, 28 Mar 2013 09:09:36 +0000 (10:09 +0100)]
bmv: check for len being valid in bmv_decode_frame().

It can be 0 or -1 for invalid files, which may result in invalid memory
access.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit b88f902125ee808c8366e9dcb3f21e4c227483fc)

Conflicts:

libavcodec/bmv.c

6 years agoxmv: do not leak memory in the error paths in xmv_read_header()
Anton Khirnov [Thu, 28 Mar 2013 09:34:47 +0000 (10:34 +0100)]
xmv: do not leak memory in the error paths in xmv_read_header()

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agomatroska: pass the lace size to the matroska_parse_rm_audio
Luca Barbato [Fri, 29 Mar 2013 11:51:51 +0000 (12:51 +0100)]
matroska: pass the lace size to the matroska_parse_rm_audio

Each lace must be independent according to the specification.

Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.

Stricter check than fc43c19a567aa945398dccb491d972c11ec2a065

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agomatroska: Update the available size after lace parsing
Dale Curtis [Wed, 27 Mar 2013 21:02:03 +0000 (14:02 -0700)]
matroska: Update the available size after lace parsing

Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agomatroska: fix a corner case in ebml-lace parsing
Luca Barbato [Thu, 28 Mar 2013 10:52:52 +0000 (11:52 +0100)]
matroska: fix a corner case in ebml-lace parsing

Make sure we notice when the lace_size[n] is a negative value.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoavfiltergraph: check for sws opts being non-NULL before using them.
Anton Khirnov [Sun, 17 Mar 2013 15:14:58 +0000 (16:14 +0100)]
avfiltergraph: check for sws opts being non-NULL before using them.

Avoid snprintfing a NULL pointer.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoSkip padding in an id3 tag in aiff files.
Carl Eugen Hoyos [Wed, 3 Apr 2013 13:45:46 +0000 (15:45 +0200)]
Skip padding in an id3 tag in aiff files.

Fixes ticket #2430.

Reviewed-by: Matthieu Bouron
(cherry picked from commit db2d3a90825025b2f5da85792e1df33280c61391)

6 years agosmacker: fix off by one error
Paul B Mahol [Wed, 3 Apr 2013 12:57:58 +0000 (12:57 +0000)]
smacker: fix off by one error

Regression since a93b572ae4f517ce0c35cf085167c318e9215908.

Fixes #2426.

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

6 years agoWrite broken aac frames to mov files instead of skipping them.
Carl Eugen Hoyos [Sat, 30 Mar 2013 07:41:46 +0000 (08:41 +0100)]
Write broken aac frames to mov files instead of skipping them.

Fixes decoding with picky media players.

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

6 years agoconfigure: Enable hwaccels without external dependencies by default.
Diego Biurrun [Mon, 18 Mar 2013 21:27:03 +0000 (22:27 +0100)]
configure: Enable hwaccels without external dependencies by default.

(cherry picked from commit 2e2ec667416d8ed345491ac360fccc94e7a4772f)

This is a fixup for f074618 to reenable auto-detection of dxva in the
build environment.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agooma: Validate sample rates
Luca Barbato [Sat, 30 Mar 2013 08:46:06 +0000 (09:46 +0100)]
oma: Validate sample rates

The sample rate index is 3 bits even if currently index 5, 6 and 7 are
not supported.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 0933fd1533560fbc718026e12f19a4824b041237)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agovp8: Fix pthread_cond and pthread_mutex leaks
Matt Wolenetz [Thu, 28 Mar 2013 00:29:57 +0000 (17:29 -0700)]
vp8: Fix pthread_cond and pthread_mutex leaks

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoconfigure: Refactor dxva2api.h dependency declarations
Diego Biurrun [Thu, 21 Feb 2013 11:39:20 +0000 (12:39 +0100)]
configure: Refactor dxva2api.h dependency declarations

(cherry picked from commit 215cdd35efd625ec28ef5846f1692b18f7c2c230)

Fixes Bug: #482

6 years agoflvdec: read audio sample size and channels metadata
Justin Ruggles [Thu, 21 Mar 2013 12:23:51 +0000 (08:23 -0400)]
flvdec: read audio sample size and channels metadata

This is needed in order for the FLV demuxer not to detect a codec change when
using the "flv_metadata" option.
(cherry picked from commit e46a2a7309d8e8b8c1573047731dea77695d0ce1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoflvdec: use the correct audio codec id when parsing metadata
Justin Ruggles [Thu, 21 Mar 2013 12:03:58 +0000 (08:03 -0400)]
flvdec: use the correct audio codec id when parsing metadata

(cherry picked from commit c3d015775388882b8a122afc337ea35108f652be)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoPrepare for 9.5 Release
Reinhard Tartler [Sun, 31 Mar 2013 08:38:00 +0000 (10:38 +0200)]
Prepare for 9.5 Release

6 years agoOnly test the first frame for missing aac_adtstoasc bistream filter.
Carl Eugen Hoyos [Tue, 26 Mar 2013 14:16:07 +0000 (15:16 +0100)]
Only test the first frame for missing aac_adtstoasc bistream filter.

Many players ignore broken aac frames, so don't abort mov or flv
muxing when encountering one, just print a warning instead.

Fixes ticket #2380.
(cherry picked from commit 1741fece7073f51efdd837a4f307ea2cdf3d1cfb)

6 years agoupdate Changelog
Reinhard Tartler [Sat, 23 Mar 2013 07:29:24 +0000 (08:29 +0100)]
update Changelog

6 years agoadd missed CVE reference in 9.2 release
Reinhard Tartler [Sat, 23 Mar 2013 07:29:04 +0000 (08:29 +0100)]
add missed CVE reference in 9.2 release

6 years agofate: fetch samples that match the release series
Reinhard Tartler [Sat, 23 Mar 2013 08:43:26 +0000 (09:43 +0100)]
fate: fetch samples that match the release series

The idea is to ensure that 'make fate-rsync' always fetches the fate
samples that work with this release.

6 years agoiff: validate CMAP palette size
Kostya Shishkov [Sun, 17 Mar 2013 19:22:19 +0000 (20:22 +0100)]
iff: validate CMAP palette size

Fixes CVE-2013-2495

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
(cherry picked from commit 50c449ac24fbb4c03c15d2e2026cef2204b80385)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoMAINTAINERS: mention that people are welcome to pick up and maintain older releases n1.1.4
Michael Niedermayer [Thu, 14 Mar 2013 13:50:42 +0000 (14:50 +0100)]
MAINTAINERS: mention that people are welcome to pick up and maintain older releases

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: update for 1.2
Michael Niedermayer [Fri, 8 Mar 2013 13:45:26 +0000 (14:45 +0100)]
MAINTAINERS: update for 1.2

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhddec: return the correct number of bytes from decode_frame
Michael Niedermayer [Mon, 4 Mar 2013 17:17:47 +0000 (18:17 +0100)]
dnxhddec: return the correct number of bytes from decode_frame

Fixes Ticket2022

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodpxenc: fix data offset
ArnoB [Thu, 14 Mar 2013 17:35:55 +0000 (18:35 +0100)]
dpxenc: fix data offset

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

Conflicts:

tests/ref/lavf/dpx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: flush audio packet on seeking
Michael Niedermayer [Sun, 17 Mar 2013 23:00:02 +0000 (00:00 +0100)]
rmdec: flush audio packet on seeking

Fixes Ticket1605

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/release/9' into release/1.1
Michael Niedermayer [Mon, 18 Mar 2013 02:11:58 +0000 (03:11 +0100)]
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  hqdn3d: Fix out of array read in LOWPASS
  vf_gradfun: fix uninitialized variable use

Conflicts:
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52' into release/1.1
Michael Niedermayer [Mon, 18 Mar 2013 01:54:35 +0000 (02:54 +0100)]
Merge commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52' into release/1.1

* commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52':
  vf_hqdn3d: fix uninitialized variable use
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()
  shorten: use the unsigned type where needed
  shorten: report meaningful errors
  shorten: K&R formatting cosmetics
  shorten: set invalid channels count to 0

Conflicts:
libavcodec/shorten.c
libavformat/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDo not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.
Carl Eugen Hoyos [Sat, 16 Mar 2013 19:13:44 +0000 (20:13 +0100)]
Do not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.

Reconfiguring can break x264 lossless encoding.

Fixes ticket #2165.
(cherry picked from commit 75c7e4583f4fd727d236a12763a265502fe00988)

6 years agohqdn3d: Fix out of array read in LOWPASS
Loren Merritt [Fri, 21 Sep 2012 23:43:16 +0000 (01:43 +0200)]
hqdn3d: Fix out of array read in LOWPASS

CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 5b3c1aecb253828d09fa9825c5a4aed97badf086)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agovf_hqdn3d: fix uninitialized variable use
Anton Khirnov [Thu, 28 Feb 2013 07:47:21 +0000 (08:47 +0100)]
vf_hqdn3d: fix uninitialized variable use

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

Conflicts:

libavfilter/vf_hqdn3d.c

6 years agovf_gradfun: fix uninitialized variable use
Anton Khirnov [Thu, 28 Feb 2013 07:47:21 +0000 (08:47 +0100)]
vf_gradfun: fix uninitialized variable use

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

Conflicts:

libavfilter/vf_gradfun.c

6 years agolzo: fix overflow checking in copy_backptr()
Xi Wang [Fri, 15 Mar 2013 10:59:22 +0000 (06:59 -0400)]
lzo: fix overflow checking in copy_backptr()

The check `src > dst' in the form `&c->out[-back] > c->out' invokes
pointer overflow, which is undefined behavior in C.

Remove the check.  Also replace `&c->out[-back] < c->out_start' with
a safe form `c->out - c->out_start < back' to avoid overflow.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6)

6 years agoflacdec: simplify bounds checking in flac_probe()
Xi Wang [Fri, 15 Mar 2013 11:11:47 +0000 (07:11 -0400)]
flacdec: simplify bounds checking in flac_probe()

Simplify `p->buf > p->buf + p->buf_size - 4' as `p->buf_size < 4'.
Avoid a possible out-of-bounds pointer, which is undefined behavior
in C.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8425d693eefbedbb41f91735614d41067695aa37)

6 years agoatrac3: avoid oversized shifting in decode_bytes()
Xi Wang [Fri, 15 Mar 2013 10:31:21 +0000 (06:31 -0400)]
atrac3: avoid oversized shifting in decode_bytes()

When `off' is 0, `0x537F6103 << 32' in the following expression invokes
undefined behavior, the result of which is not necessarily 0.

    (0x537F6103 >> (off * 8)) | (0x537F6103 << (32 - (off * 8)))

Avoid oversized shifting.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit eba1ff31304e407db3cefd7532108408f364367b)

6 years agoupdate for 1.1.4
Michael Niedermayer [Thu, 14 Mar 2013 16:39:57 +0000 (17:39 +0100)]
update for 1.1.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: be less picky on padding
Michael Niedermayer [Thu, 14 Mar 2013 16:20:44 +0000 (17:20 +0100)]
jpegdec: be less picky on padding

Fixes Ticket2353

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoiff: fix integer overflow
Michael Niedermayer [Tue, 5 Mar 2013 00:35:28 +0000 (01:35 +0100)]
iff: fix integer overflow

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsrledec: fix output_end checks
Michael Niedermayer [Tue, 5 Mar 2013 01:19:12 +0000 (02:19 +0100)]
msrledec: fix output_end checks

Fixes out of array accesses

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

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