[FFmpeg-cvslog] Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
Michael Niedermayer
git at videolan.org
Sat May 30 22:03:43 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 30 21:33:00 2015 +0200| [e9d646f44c6a3208e35a055ba2154f25ba497fa2] | committer: Michael Niedermayer
Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
h264: Make sure reinit failures mark the context as not initialized
Conflicts:
libavcodec/h264_slice.c
See: e8714f6f93d1a32f4e4655209960afcf4c185214
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9d646f44c6a3208e35a055ba2154f25ba497fa2
---
More information about the ffmpeg-cvslog
mailing list