Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 01:44:17 +0000 (03:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:03:41 +0000 (04:03 +0200)
commitaf89c144181f4a7003477c22a88d40b366b42a7c
treea927915b8490449414eb240d8277faff10d3e400
parentd6095662706d3f0b334645eb7f92ed24a4d9e4ed
parent0b66fb4505e0bb43de3797f63f3290f0188d67cc
Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc'

* commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc':
  flac_picture: prevent a possible out of bound write

This is only partly merged, the condition this checks for
is impossible to be true as it would imply avio_read() to
read more than the size passed to it

See: 731f7eaaade4c0cf91f8008cc30c0342caa64df1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flac_picture.c