diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-10 11:49:46 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-10 12:07:04 +0000 |
| commit | 093d292b67c22d7adf2bdbe647f9827eff73ecf7 (patch) | |
| tree | 0fc06b75dd70034bb660dc17cbf5498b401972c5 | |
| parent | 3b924de03dbb77d2c5bad5a7d754ad436bdfb161 (diff) | |
| download | gstreamer-plugins-base-093d292b67c22d7adf2bdbe647f9827eff73ecf7.tar.gz | |
videodecoder: Only keep track of timestamps if the subclass is parsing data
Otherwise we just pass through the timestamps directly and don't
need to waste additional memory for them.
Fixes bug #689814.
Conflicts:
gst-libs/gst/video/gstvideodecoder.c
| -rw-r--r-- | gst-libs/gst/video/gstvideodecoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index f0b457540..fc5a6faa4 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -1611,7 +1611,7 @@ gst_video_decoder_chain_forward (GstVideoDecoder * decoder, if (priv->current_frame == NULL) priv->current_frame = gst_video_decoder_new_frame (decoder); - if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { + if (GST_BUFFER_TIMESTAMP_IS_VALID (buf) && !priv->packetized) { gst_video_decoder_add_timestamp (decoder, buf); } priv->input_offset += GST_BUFFER_SIZE (buf); |