[FFmpeg-cvslog] Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'
Michael Niedermayer
git at videolan.org
Sat Feb 16 18:59:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 16 18:46:28 2013 +0100| [1fad547cefb4d2f3ed3d764b547ee16cf399e477] | committer: Michael Niedermayer
Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'
* commit '54974c62982ae827becdbdb9b620b7ba75d079a0':
error_resilience: decouple ER from MpegEncContext
Conflicts:
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fad547cefb4d2f3ed3d764b547ee16cf399e477
---
More information about the ffmpeg-cvslog
mailing list