Merge commit 'e1f90771'
* commit 'e1f90771': h264: factor out common code from init() and init_thread_copy() Conflicts: libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'e1f90771': h264: factor out common code from init() and init_thread_copy() Conflicts: libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>