[FFmpeg-cvslog] Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
Michael Niedermayer
git at videolan.org
Tue Jan 14 21:59:54 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 21:53:12 2014 +0100| [d938a013af7607485eac4d0af1d8f5d08bac778e] | committer: Michael Niedermayer
Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
mxf: Fix off by one error in d10 aes3 decoding
Conflicts:
libavformat/mxfdec.c
See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d938a013af7607485eac4d0af1d8f5d08bac778e
---
More information about the ffmpeg-cvslog
mailing list