1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'

* commit '26179964ff3fa1173e6f512c5735ba8223e2395d':
  h264_sei: log unknown sei messages

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-24 15:03:32 +02:00
commit 9c2e31c3b3

View File

@ -318,6 +318,9 @@ int ff_h264_decode_sei(H264Context *h)
case SEI_TYPE_FRAME_PACKING:
if (decode_frame_packing(h, size) < 0)
return -1;
break;
default:
av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type);
}
skip_bits_long(&h->gb, next - get_bits_count(&h->gb));