diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-02-15 17:14:34 +0100 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-02-15 17:14:34 +0100 |
| commit | ca5010cc4b8b27555ea4b858e089a6119db20060 (patch) | |
| tree | 2fb932498ab52605ba5ee4ad2f90e15d6f195339 /gst-libs | |
| parent | 52fce494597198db0d0422cec99026e19cbc4495 (diff) | |
| parent | e373df2a973db5c4f99ead59565d2f4f7e8297a9 (diff) | |
Merge branch 'master' into 0.11
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/codecparsers/gsth264parser.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c index 2f18ffd38..572a28ded 100644 --- a/gst-libs/gst/codecparsers/gsth264parser.c +++ b/gst-libs/gst/codecparsers/gsth264parser.c @@ -1938,13 +1938,11 @@ gst_h264_parser_parse_sei (GstH264NalParser * nalparser, GstH264NalUnit * nalu, sei->payloadType, payload_size); if (sei->payloadType == GST_H264_SEI_BUF_PERIOD) { - /* Set the nal reader size properly */ - nr.size = payload_size; + /* size not set; might depend on emulation_prevention_three_byte */ res = gst_h264_parser_parse_buffering_period (nalparser, &sei->buffering_period, &nr); } else if (sei->payloadType == GST_H264_SEI_PIC_TIMING) { - /* Set the nal reader size properly */ - nr.size = payload_size; + /* size not set; might depend on emulation_prevention_three_byte */ res = gst_h264_parser_parse_pic_timing (nalparser, &sei->pic_timing, &nr); } else res = GST_H264_PARSER_OK; |