ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Apr 5
21:56:50 2015 +0200| [abae926ef80c8553c732b95649d334b7a91374d3] | committer:
Michael Niedermayer
Merge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'
* commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7':
h264: factor out common code from init() and init_thread_copy()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abae926ef80c8553c732b95649d334b7a91374d3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
