Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavformat / img2.c

diff --git a/ffmpeg/libavformat/img2.c b/ffmpeg/libavformat/img2.c
index 80020549f63a5b37cf3d02d0ead813e424fe6ca1..d6f124465032b6e831ca47b43e35eca1481baa45 100644 (file)
--- a/ffmpeg/libavformat/img2.c
+++ b/ffmpeg/libavformat/img2.c
@@ -57,7 +57,6 @@ static const IdStrMap img_tags[] = {
     { AV_CODEC_ID_TIFF,       "tif"      },
     { AV_CODEC_ID_SGI,        "sgi"      },
     { AV_CODEC_ID_PTX,        "ptx"      },
-    { AV_CODEC_ID_BRENDER_PIX,"pix"      },
     { AV_CODEC_ID_PCX,        "pcx"      },
     { AV_CODEC_ID_SUNRAST,    "sun"      },
     { AV_CODEC_ID_SUNRAST,    "ras"      },