diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:52:46 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:52:46 +0100 |
| commit | 6c2f5814efac174fd678e33b2ad71f64b4aecf91 (patch) | |
| tree | 5f1571ac16efb33eb6897dbbb88b3dabec005388 /gst | |
| parent | 1119f6ee4103990ccc55d521be08bdce10737c8e (diff) | |
| download | gstreamer-plugins-bad-6c2f5814efac174fd678e33b2ad71f64b4aecf91.tar.gz | |
h264parse: report after merge
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/videoparsers/gsth264parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c index 2ba6af0ae..d7890f674 100644 --- a/gst/videoparsers/gsth264parse.c +++ b/gst/videoparsers/gsth264parse.c @@ -355,7 +355,7 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, GstCaps * in_caps) if (caps) { /* fixate to avoid ambiguity with lists when parsing */ - gst_pad_fixate_caps (GST_BASE_PARSE_SRC_PAD (h264parse), caps); + gst_caps_fixate (caps); gst_h264_parse_format_from_caps (caps, &format, &align); gst_caps_unref (caps); } @@ -1914,13 +1914,13 @@ gst_h264_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) GST_BUFFER_TIMESTAMP (sub) = GST_BUFFER_TIMESTAMP (buffer); /* transfer flags (e.g. DISCONT) for first fragment */ if (nalu.offset <= nl) - gst_buffer_copy_metadata (sub, buffer, GST_BUFFER_COPY_FLAGS); + gst_buffer_copy_into (sub, buffer, GST_BUFFER_COPY_FLAGS, 0, -1); /* in reverse playback, baseparse gathers buffers, so we cannot * guarantee a buffer to contain a single whole NALU */ h264parse->packetized_chunked = (GST_BASE_PARSE (h264parse)->segment.rate > 0.0); h264parse->packetized_last = - (nalu.offset + nalu.size + nl >= GST_BUFFER_SIZE (buffer)); + (nalu.offset + nalu.size + nl >= gst_buffer_get_size (buffer)); GST_LOG_OBJECT (h264parse, "pushing NAL of size %d, last = %d", nalu.size, h264parse->packetized_last); ret = h264parse->parse_chain (pad, parent, sub); |