[FFmpeg-cvslog] Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'
Michael Niedermayer
git at videolan.org
Mon Jan 6 13:37:32 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 6 13:30:40 2014 +0100| [d701f5996daf64f5abac8e402b7b62d5c48c63e1] | committer: Michael Niedermayer
Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'
* commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e':
4xm: return a proper error code.
Conflicts:
libavcodec/4xm.c
See: a5e382ad7ffd8be810f3a614c4c447a1cd1936f2
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d701f5996daf64f5abac8e402b7b62d5c48c63e1
---
More information about the ffmpeg-cvslog
mailing list