[FFmpeg-cvslog] Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'
Michael Niedermayer
git at videolan.org
Tue Jan 14 22:28:46 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 22:16:38 2014 +0100| [e3c0fcaddabe91dfcfce4f606a576c79be1a6779] | committer: Michael Niedermayer
Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'
* commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf':
mxf: Use av_malloc_array
Conflicts:
libavformat/mxfdec.c
See: 8ce41721a4a29711211f8dad0c86502caf86f4d3
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3c0fcaddabe91dfcfce4f606a576c79be1a6779
---
More information about the ffmpeg-cvslog
mailing list