-
Michael Niedermayer authored
* commit 'ee62b364': h264: eliminate ff_h264_set_parameter_from_sps() Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
ab7ad5e6
* commit 'ee62b364': h264: eliminate ff_h264_set_parameter_from_sps() Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by:Michael Niedermayer <michaelni@gmx.at>