[FFmpeg-cvslog] Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
Michael Niedermayer
git at videolan.org
Wed Mar 13 03:04:22 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 02:56:33 2013 +0100| [1f27053b91e4f0b1f6571448db9e363fd84e65b6] | committer: Michael Niedermayer
Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
lavc: remove disabled FF_API_LIBMPEG2 cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f27053b91e4f0b1f6571448db9e363fd84e65b6
---
More information about the ffmpeg-cvslog
mailing list