-
James Almer authored
* commit 'bc7f4268': h264: drop tests whether the codec id is AV_CODEC_ID_H264 Conflicts: libavcodec/h264dec.c Merged-by:
James Almer <jamrial@gmail.com>
517dd04f
* commit 'bc7f4268': h264: drop tests whether the codec id is AV_CODEC_ID_H264 Conflicts: libavcodec/h264dec.c Merged-by:James Almer <jamrial@gmail.com>