Merge commit '48d0fd2d'
* commit '48d0fd2d': h264: merge common_init() into ff_h264_decode_init. Conflicts: libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '48d0fd2d': h264: merge common_init() into ff_h264_decode_init. Conflicts: libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>