-
Michael Niedermayer authored
* commit '88c612e3': h264: merge the init and reinit paths in update_thread_context() Conflicts: libavcodec/h264_slice.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
bd7dce59
* commit '88c612e3': h264: merge the init and reinit paths in update_thread_context() Conflicts: libavcodec/h264_slice.c Merged-by:Michael Niedermayer <michaelni@gmx.at>