diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:49:27 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:49:27 +0100 |
| commit | 4917e16458a7e59797e43ace5373a10c5bcc6925 (patch) | |
| tree | 3bab2357e614718bf6a8d022f4fba3429a689604 /gst-libs | |
| parent | f70a623418a52eada0278002f8d266d49957b3d5 (diff) | |
| parent | 51f399686eb172baf7b27b300b8b84869fdb85fa (diff) | |
| download | gstreamer-plugins-bad-4917e16458a7e59797e43ace5373a10c5bcc6925.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
tests/examples/camerabin2/Makefile.am
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/video/gstbasevideocodec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c index 816e62e35..c545b0786 100644 --- a/gst-libs/gst/video/gstbasevideocodec.c +++ b/gst-libs/gst/video/gstbasevideocodec.c @@ -152,6 +152,8 @@ gst_base_video_codec_reset (GstBaseVideoCodec * base_video_codec) gst_buffer_replace (&base_video_codec->state.codec_data, NULL); gst_caps_replace (&base_video_codec->state.caps, NULL); + memset (&base_video_codec->state, 0, sizeof (GstVideoState)); + base_video_codec->state.format = GST_VIDEO_FORMAT_UNKNOWN; GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_codec); } |