projects
/
platform
/
upstream
/
gst-libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
575cb87
)
ffdemux: activate pad before setting caps
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 13 Mar 2012 12:24:23 +0000
(13:24 +0100)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 13 Mar 2012 12:24:23 +0000
(13:24 +0100)
ext/ffmpeg/gstffmpegdemux.c
patch
|
blob
|
history
diff --git
a/ext/ffmpeg/gstffmpegdemux.c
b/ext/ffmpeg/gstffmpegdemux.c
index 2a97e12f80a635b2d17e66fccb1e9fd5c93cb5f7..24948f8eb974bee3a2da357789d67c832efe99a7 100644
(file)
--- a/
ext/ffmpeg/gstffmpegdemux.c
+++ b/
ext/ffmpeg/gstffmpegdemux.c
@@
-974,6
+974,7
@@
gst_ffmpegdemux_get_stream (GstFFMpegDemux * demux, AVStream * avstream)
g_free (padname);
gst_pad_use_fixed_caps (pad);
+ gst_pad_set_active (pad, TRUE);
gst_pad_set_caps (pad, caps);
gst_caps_unref (caps);
@@
-1001,7
+1002,6
@@
gst_ffmpegdemux_get_stream (GstFFMpegDemux * demux, AVStream * avstream)
demux->streams[avstream->index] = stream;
/* activate and add */
- gst_pad_set_active (pad, TRUE);
gst_element_add_pad (GST_ELEMENT (demux), pad);
/* metadata */