[FFmpeg-cvslog] Merge commit '0d6605c7ef43f97a88950542af09078adef33b6d'
Michael Niedermayer
git at videolan.org
Tue Jan 14 22:41:58 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 22:29:42 2014 +0100| [bd8788ea17c3fffdaf67756f580ab03688fff4c7] | committer: Michael Niedermayer
Merge commit '0d6605c7ef43f97a88950542af09078adef33b6d'
* commit '0d6605c7ef43f97a88950542af09078adef33b6d':
mxf: Fix a possible leak of extradata
Conflicts:
libavformat/mxfdec.c
See: b65570808cb3b518f969f9288fe643bca6361b8f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd8788ea17c3fffdaf67756f580ab03688fff4c7
---
More information about the ffmpeg-cvslog
mailing list