mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

flv: Specify the only possible stream-format for h264 in the pad templates.

Browse source
This commit is contained in:
Zaheer Abbas Merali 2011-04-04 10:31:44 +01:00
parent fb12172810
commit d44d498aa4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/flv/gstflvdemux.c
View file

@ -70,7 +70,8 @@ static GstStaticPadTemplate video_src_template =
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/x-flash-video; " GST_STATIC_CAPS ("video/x-flash-video; "
"video/x-flash-screen; " "video/x-flash-screen; "
"video/x-vp6-flash; " "video/x-vp6-alpha; " "video/x-h264;") "video/x-vp6-flash; " "video/x-vp6-alpha; "
"video/x-h264, stream-format=avc;")
); );
GST_DEBUG_CATEGORY_STATIC (flvdemux_debug); GST_DEBUG_CATEGORY_STATIC (flvdemux_debug);
@ -1057,7 +1058,9 @@ gst_flv_demux_video_negotiate (GstFlvDemux * demux, guint32 codec_tag)
caps = gst_caps_new_simple ("video/x-vp6-alpha", NULL); caps = gst_caps_new_simple ("video/x-vp6-alpha", NULL);
break; break;
case 7: case 7:
caps = gst_caps_new_simple ("video/x-h264", NULL); caps =
gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING,
"avc", NULL);
break; break;
default: default:
GST_WARNING_OBJECT (demux, "unsupported video codec tag %u", codec_tag); GST_WARNING_OBJECT (demux, "unsupported video codec tag %u", codec_tag);

3
gst/flv/gstflvmux.c
View file

@ -63,7 +63,8 @@ static GstStaticPadTemplate videosink_templ = GST_STATIC_PAD_TEMPLATE ("video",
GST_PAD_REQUEST, GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/x-flash-video; " GST_STATIC_CAPS ("video/x-flash-video; "
"video/x-flash-screen; " "video/x-flash-screen; "
"video/x-vp6-flash; " "video/x-vp6-alpha; " "video/x-h264;") "video/x-vp6-flash; " "video/x-vp6-alpha; "
"video/x-h264, stream-format=avc;")
); );
static GstStaticPadTemplate audiosink_templ = GST_STATIC_PAD_TEMPLATE ("audio", static GstStaticPadTemplate audiosink_templ = GST_STATIC_PAD_TEMPLATE ("audio",