[FFmpeg-cvslog] Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'
Michael Niedermayer
git at videolan.org
Sat Mar 21 21:51:05 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 21:41:17 2015 +0100| [0f8bb0efc3cf9e2b86c7e518f24133ea358566d5] | committer: Michael Niedermayer
Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'
* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736':
h264: drop the now unused per-slice H264Contexts
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f8bb0efc3cf9e2b86c7e518f24133ea358566d5
---
More information about the ffmpeg-cvslog
mailing list