[FFmpeg-cvslog] Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'
Michael Niedermayer
git at videolan.org
Sat Feb 21 11:52:38 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 21 11:40:44 2015 +0100| [6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61] | committer: Michael Niedermayer
Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'
* commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40':
h264: only ref cur_pic in update_thread_context if it is initialized
Conflicts:
libavcodec/h264_slice.c
See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61
---
More information about the ffmpeg-cvslog
mailing list