[FFmpeg-cvslog] Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
Michael Niedermayer
git at videolan.org
Mon Jan 14 15:40:52 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 15:36:35 2013 +0100| [f9d5bdd0f6526e852ec37528c9b5f97beb71ef07] | committer: Michael Niedermayer
Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e':
loco: return meaningful error codes.
flicvideo: return meaningful error codes.
vcr1: remove disabled encoder stub
Conflicts:
libavcodec/flicvideo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9d5bdd0f6526e852ec37528c9b5f97beb71ef07
---
More information about the ffmpeg-cvslog
mailing list