[FFmpeg-cvslog] Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'
Michael Niedermayer
git at videolan.org
Thu Jul 11 11:33:38 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 11 11:29:51 2013 +0200| [2efc2b53be96efc7c647f13af00e48b53c249bdd] | committer: Michael Niedermayer
Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'
* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
iff: Do not read over the source buffer
Conflicts:
libavcodec/iff.c
See: 2fbb37b51bbea891392ad357baf8f3dff00bac05
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2efc2b53be96efc7c647f13af00e48b53c249bdd
---
More information about the ffmpeg-cvslog
mailing list