From d5b03052417556e9f68eae82ca0f9f19495f429f Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Tue, 13 Jun 2017 18:50:50 +0200 Subject: [PATCH] Enable gif format, and make it so avdemux_gif and avdec_gif can autoplug https://bugzilla.gnome.org/show_bug.cgi?id=784684 --- ext/libav/gstavcodecmap.c | 4 ++-- ext/libav/gstavdemux.c | 2 +- ext/libav/gstavviddec.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c index cc61ec7..9a72033 100644 --- a/ext/libav/gstavcodecmap.c +++ b/ext/libav/gstavcodecmap.c @@ -1621,8 +1621,8 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id, case AV_CODEC_ID_GIF: caps = - gst_ff_vid_caps_new (context, NULL, codec_id, encode, "image/gif", - NULL); + gst_ff_vid_caps_new (context, NULL, codec_id, encode, + "image/gst-libav-gif", "parsed", G_TYPE_BOOLEAN, TRUE, NULL); break; case AV_CODEC_ID_PNG: diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c index 33ef89e..e3ff491 100644 --- a/ext/libav/gstavdemux.c +++ b/ext/libav/gstavdemux.c @@ -2087,7 +2087,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin) !strcmp (in_plugin->name, "mpc8") || !strcmp (in_plugin->name, "ivf") || !strcmp (in_plugin->name, "brstm") || - !strcmp (in_plugin->name, "bfstm")) + !strcmp (in_plugin->name, "bfstm") || !strcmp (in_plugin->name, "gif")) rank = GST_RANK_MARGINAL; else { GST_DEBUG ("ignoring %s", in_plugin->name); diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index f911bce..f9c6096 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -2328,8 +2328,7 @@ gst_ffmpegviddec_register (GstPlugin * plugin) /* MP1 : Use MP3 for decoding */ /* MP2 : Use MP3 for decoding */ /* Theora: Use libtheora based theoradec */ - if (!strcmp (in_plugin->name, "gif") || - !strcmp (in_plugin->name, "theora") || + if (!strcmp (in_plugin->name, "theora") || !strcmp (in_plugin->name, "mpeg1video") || strstr (in_plugin->name, "crystalhd") != NULL || !strcmp (in_plugin->name, "ass") || -- 2.7.4