summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wtaymans@redhat.com>2014-06-06 16:19:07 +0200
committerWim Taymans <wtaymans@redhat.com>2014-06-06 16:54:06 +0200
commitdf8674f6c3deb581b3342e59b7ee299a2b4de3d2 (patch)
tree87df452b5be446b30bd7a5d6cb2ca9c44793134a
parentfd7ba73304377e2e52580176d1da53e0e2b70541 (diff)
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.
-rw-r--r--ext/libav/gstavcodecmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index 6ef0af1..7f4177b 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -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",
"mpegversion", G_TYPE_INT, 4, "systemstream", G_TYPE_BOOLEAN, FALSE,
NULL);
- gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
- encode, "video/x-xvid", NULL));
if (encode) {
gst_caps_append (caps, gst_ff_vid_caps_new (context, NULL, codec_id,
encode, "video/x-divx", "divxversion", G_TYPE_INT, 5, NULL));
@@ -1001,6 +999,8 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
encode, "video/x-divx", "divxversion", GST_TYPE_INT_RANGE, 4,
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,
encode, "video/x-3ivx", NULL));
}
}