[FFmpeg-cvslog] Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
Michael Niedermayer
git at videolan.org
Mon Jan 7 01:34:16 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 7 01:30:23 2013 +0100| [55d8cac254ee2aeba051810ca92bb868fcbd8468] | committer: Michael Niedermayer
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
v210x: return meaningful error codes.
r210dec: return meaningful error codes.
vb: cosmetics, reformat
Conflicts:
libavcodec/vb.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55d8cac254ee2aeba051810ca92bb868fcbd8468
---
More information about the ffmpeg-cvslog
mailing list