ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Mon Mar
9 12:11:40 2015 +0100| [b837d5bf83f982410fd94f6a2aaa24c29e5e770f] | committer:
Michael Niedermayer
Merge commit '03fbb6ff3d28f639ea5a35aba3c6dca09c17225d' into release/2.2
* commit '03fbb6ff3d28f639ea5a35aba3c6dca09c17225d':
h264: only ref cur_pic in update_thread_context if it is initialized
Conflicts:
libavcodec/h264.c
See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b837d5bf83f982410fd94f6a2aaa24c29e5e770f
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
