[FFmpeg-cvslog] Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
Michael Niedermayer
git at videolan.org
Tue Jan 29 14:05:44 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 29 13:57:57 2013 +0100| [f02033b98b7545dad2e123a939ac7dceb1ce2f7a] | committer: Michael Niedermayer
Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
mdec: cosmetics, reformat
Conflicts:
libavcodec/mdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f02033b98b7545dad2e123a939ac7dceb1ce2f7a
---
More information about the ffmpeg-cvslog
mailing list