codecmap: don't expose more deprecated media types

x-xvid is deprecated, we don't want to expose it on the encoder, just
leave it only exposed on the decoder.
This commit is contained in:
Wim Taymans 2014-06-06 16:19:07 +02:00
parent fd7ba73304
commit df8674f6c3

View file

@ -991,8 +991,6 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
gst_ff_vid_caps_new (context, NULL, codec_id, encode, "video/mpeg", gst_ff_vid_caps_new (context, NULL, codec_id, encode, "video/mpeg",
"mpegversion", G_TYPE_INT, 4, "systemstream", G_TYPE_BOOLEAN, FALSE, "mpegversion", G_TYPE_INT, 4, "systemstream", G_TYPE_BOOLEAN, FALSE,
NULL); NULL);
gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
encode, "video/x-xvid", NULL));
if (encode) { if (encode) {
gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id, gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
encode, "video/x-divx", "divxversion", G_TYPE_INT, 5, NULL)); encode, "video/x-divx", "divxversion", G_TYPE_INT, 5, NULL));
@ -1000,6 +998,8 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id, gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
encode, "video/x-divx", "divxversion", GST_TYPE_INT_RANGE, 4, encode, "video/x-divx", "divxversion", GST_TYPE_INT_RANGE, 4,
5, NULL)); 5, NULL));
gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
encode, "video/x-xvid", NULL));
gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id, gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
encode, "video/x-3ivx", NULL)); encode, "video/x-3ivx", NULL));
} }