diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-09 13:53:19 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-09 13:59:38 +0200 |
| commit | 8596e8d5daeb49e438c9e1be838f205bf8f227b7 (patch) | |
| tree | 5feded99bf4872836a17564863cf0c8425aff7f4 /gst/videoparsers/gstmpeg4videoparse.c | |
| parent | 12add5d529e96cd41f0c2d8a5179871d47e20b48 (diff) | |
| download | gstreamer-plugins-bad-8596e8d5daeb49e438c9e1be838f205bf8f227b7.tar.gz | |
mpeg4videoparse: properly mark config data presence
... which we allow to start at VisualObjectSequence or
at VideoObject.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=685709
Diffstat (limited to 'gst/videoparsers/gstmpeg4videoparse.c')
| -rw-r--r-- | gst/videoparsers/gstmpeg4videoparse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gst/videoparsers/gstmpeg4videoparse.c b/gst/videoparsers/gstmpeg4videoparse.c index f08af17a1..bef9173cc 100644 --- a/gst/videoparsers/gstmpeg4videoparse.c +++ b/gst/videoparsers/gstmpeg4videoparse.c @@ -191,6 +191,7 @@ gst_mpeg4vparse_reset_frame (GstMpeg4VParse * mp4vparse) mp4vparse->last_sc = -1; mp4vparse->vop_offset = -1; mp4vparse->vo_found = FALSE; + mp4vparse->config_found = FALSE; mp4vparse->vol_offset = -1; mp4vparse->vo_offset = -1; } @@ -372,7 +373,7 @@ gst_mpeg4vparse_process_sc (GstMpeg4VParse * mp4vparse, GstMpeg4Packet * packet, } /* parse config data ending here if proper startcodes found earlier; * we should have received a visual object before. */ - if (mp4vparse->vo_found) { + if (mp4vparse->config_found) { /*Do not take care startcode into account */ gst_mpeg4vparse_process_config (mp4vparse, packet->data, packet->offset, packet->offset - 3); @@ -382,6 +383,7 @@ gst_mpeg4vparse_process_sc (GstMpeg4VParse * mp4vparse, GstMpeg4Packet * packet, } case GST_MPEG4_VISUAL_OBJ_SEQ_START: GST_LOG_OBJECT (mp4vparse, "Visual Sequence Start"); + mp4vparse->config_found = TRUE; mp4vparse->profile = gst_codec_utils_mpeg4video_get_profile (packet->data + packet->offset + 1, packet->offset); mp4vparse->level = gst_codec_utils_mpeg4video_get_level (packet->data @@ -404,6 +406,7 @@ gst_mpeg4vparse_process_sc (GstMpeg4VParse * mp4vparse, GstMpeg4Packet * packet, /* VO (video object) cases */ } else if (packet->type <= GST_MPEG4_VIDEO_OBJ_LAST) { GST_LOG_OBJECT (mp4vparse, "Video object"); + mp4vparse->config_found = TRUE; } break; } |