[FFmpeg-cvslog] Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'
Michael Niedermayer
git at videolan.org
Thu Mar 28 11:53:15 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 11:45:04 2013 +0100| [016c00cf68a481000f48ece6c11f622ba65e8045] | committer: Michael Niedermayer
Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'
* commit '1b6d66745ac1768adb387c2227cdcf4452271149':
Split MPEG-1/2 decoder code off from MPEG-1/2 common code
Conflicts:
libavcodec/Makefile
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=016c00cf68a481000f48ece6c11f622ba65e8045
---
More information about the ffmpeg-cvslog
mailing list