[FFmpeg-cvslog] Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'
Michael Niedermayer
git at videolan.org
Fri Nov 29 22:20:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 22:12:36 2013 +0100| [f924d6e40b269158ff54f5b5a6f08ae3fdefbd5c] | committer: Michael Niedermayer
Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'
* commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f':
mxfdec: set extradata size
Conflicts:
libavformat/mxfdec.c
no change as ffmpeg was not affected by this bug
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f924d6e40b269158ff54f5b5a6f08ae3fdefbd5c
---
More information about the ffmpeg-cvslog
mailing list