Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 270ffd9aca7d108a72e100e98ea231c79e3b1e1c..7539359540ed873b77ecf96975ef34671793542b 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -50,7 +50,6 @@ static const IdStrMap img_tags[] = {
     { AV_CODEC_ID_RAWVIDEO,   "y"        },
     { AV_CODEC_ID_RAWVIDEO,   "raw"      },
     { AV_CODEC_ID_BMP,        "bmp"      },
-    { AV_CODEC_ID_GIF,        "gif"      },
     { AV_CODEC_ID_TARGA,      "tga"      },
     { AV_CODEC_ID_TIFF,       "tiff"     },
     { AV_CODEC_ID_TIFF,       "tif"      },