summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wtaymans@redhat.com>2014-06-06 16:16:27 +0200
committerWim Taymans <wtaymans@redhat.com>2014-06-06 16:54:06 +0200
commitfd7ba73304377e2e52580176d1da53e0e2b70541 (patch)
tree1f0f01a1a19958c4cbda258571e5905143dc2edb
parent10e060649109ffb790a2b5bbfa978fd5d5c6ddd5 (diff)
Revert "avcodecmap: do more reverse mapping of MPEG4"
This reverts commit e066785ad05f9119e3c1eded46260bcabd556b4d. x-xvid and x-3ivx are removed, we don't want to expose them again.
-rw-r--r--ext/libav/gstavcodecmap.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index 8a9c0ba..6ef0af1 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -976,16 +976,6 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
gst_ff_vid_caps_new (context, NULL, codec_id, encode,
"video/x-divx", "divxversion", G_TYPE_INT, 5, NULL);
break;
- case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
- caps =
- gst_ff_vid_caps_new (context, NULL, codec_id, encode,
- "video/x-xvid", NULL);
- break;
- case GST_MAKE_FOURCC ('3', 'I', 'V', '1'):
- caps =
- gst_ff_vid_caps_new (context, NULL, codec_id, encode,
- "video/x-3ivx", NULL);
- break;
case GST_MAKE_FOURCC ('m', 'p', '4', 'v'):
default:
/* FIXME: bitrate */