[FFmpeg-cvslog] Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
Michael Niedermayer
git at videolan.org
Thu Mar 6 22:28:39 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 6 22:19:01 2014 +0100| [2265212396c1126ee4b21cc038a2bc7eab16e60a] | committer: Michael Niedermayer
Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
mxf: Introduce ff_mxf_get_samples_per_frame
Conflicts:
libavformat/mxf.c
libavformat/mxf.h
See: 906a2638139bfcce17d423cfa3a8ee633b38a2af
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2265212396c1126ee4b21cc038a2bc7eab16e60a
---
More information about the ffmpeg-cvslog
mailing list