[FFmpeg-cvslog] Merge commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f'
Michael Niedermayer
git at videolan.org
Wed Apr 29 12:20:05 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 12:04:26 2015 +0200| [580c86925ddf8c85d2e6f57ed55dd75853748b29] | committer: Michael Niedermayer
Merge commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f'
* commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f':
h264: move context reinit lower down 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=580c86925ddf8c85d2e6f57ed55dd75853748b29
---
More information about the ffmpeg-cvslog
mailing list