Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:29:51 +0000 (11:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:32:36 +0000 (11:32 +0200)
commit2efc2b53be96efc7c647f13af00e48b53c249bdd
tree01f65dd3c9dcb2369d04946f19215d7e2b8d3ead
parent56090b5b80431bfd791dbe8cfd23c058214118da
parent7d65e960c72f36b73ae7fe84f8e427d758e61da9
Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'

* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
  iff: Do not read over the source buffer

Conflicts:
libavcodec/iff.c

See: 2fbb37b51bbea891392ad357baf8f3dff00bac05

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