[FFmpeg-cvslog] Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
Michael Niedermayer
git at videolan.org
Tue Jan 27 15:06:31 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 14:56:52 2015 +0100| [3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba] | committer: Michael Niedermayer
Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
error_resilience: move the MECmpContext initialization into ER code
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba
---
More information about the ffmpeg-cvslog
mailing list