[FFmpeg-cvslog] Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'
Michael Niedermayer
git at videolan.org
Mon Jun 23 04:05:57 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 03:48:30 2014 +0200| [56afbe8dbc6e508ba279bb95db542b940284fa7d] | committer: Michael Niedermayer
Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'
* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e':
mpeg: Split error resilience bits off into a separate file
Conflicts:
configure
libavcodec/Makefile
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56afbe8dbc6e508ba279bb95db542b940284fa7d
---
More information about the ffmpeg-cvslog
mailing list