]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'c12c085be7e86880924249e5cb3f898e45dee134'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:32:27 +0000 (15:32 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:32:27 +0000 (15:32 +0100)
* commit 'c12c085be7e86880924249e5cb3f898e45dee134':
  dcadec: Do not check for overreads in auxiliary data

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dcadec.c

Simple merge