[FFmpeg-cvslog] Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'
Michael Niedermayer
git at videolan.org
Thu Jun 13 11:49:43 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 10:08:50 2013 +0200| [60657ee37afb5388b75430db95cbce5146731c63] | committer: Michael Niedermayer
Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'
* commit 'e7a44f87d07655ec0cd31c315936931674434340':
4xm: refactor fourxm_read_header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60657ee37afb5388b75430db95cbce5146731c63
---
More information about the ffmpeg-cvslog
mailing list