[FFmpeg-cvslog] Merge commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f'
Michael Niedermayer
git at videolan.org
Wed Apr 29 15:22:25 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 14:18:30 2015 +0200| [bd7dce594ea76b3d9a898c6ceb55ccc91ec76001] | committer: Michael Niedermayer
Merge commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f'
* commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f':
h264: merge the init and reinit paths in update_thread_context()
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd7dce594ea76b3d9a898c6ceb55ccc91ec76001
---
More information about the ffmpeg-cvslog
mailing list