[FFmpeg-cvslog] Merge commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa'
Michael Niedermayer
git at videolan.org
Sat Jun 27 22:16:01 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 27 21:44:08 2015 +0200| [bd5c6a519e9bb36256cbcc188b6c9721760f2290] | committer: Michael Niedermayer
Merge commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa'
* commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa':
h264: do not update the context fields copied between threads after finish_setup()
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See: f111831ed61103f9fa8fdda41473a23da016bdaa and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd5c6a519e9bb36256cbcc188b6c9721760f2290
---
More information about the ffmpeg-cvslog
mailing list