Merge commit 'b18346817d57c96cc47811cf78b26653e96bd304'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 19:52:18 +0000 (21:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 20:08:28 +0000 (22:08 +0200)
commita5379d6e68cbdd894941d7962e72af890d41d1b7
treef99efbdf46ff96dc681d378d2217a69dad62868e
parent5a14fca9aacaf9ad4fd6b30792463949180e4300
parentb18346817d57c96cc47811cf78b26653e96bd304
Merge commit 'b18346817d57c96cc47811cf78b26653e96bd304'

* commit 'b18346817d57c96cc47811cf78b26653e96bd304':
  flac: fix realloc loop with invalid flac files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flac_parser.c