[FFmpeg-cvslog] Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
Michael Niedermayer
git at videolan.org
Thu Mar 28 12:00:34 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 11:56:05 2013 +0100| [2bfcd74ad3e331e995755ac865abc370d3e544c8] | committer: Michael Niedermayer
Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
mpeg12: Move Mpeg1Context declaration to the only place it is used
Conflicts:
libavcodec/mpeg12.h
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2bfcd74ad3e331e995755ac865abc370d3e544c8
---
More information about the ffmpeg-cvslog
mailing list