]> git.sesse.net Git - vlc/commitdiff
Put SGI decoder with the latest version of ffmpeg.
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 11 May 2007 23:13:51 +0000 (23:13 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 11 May 2007 23:13:51 +0000 (23:13 +0000)
modules/codec/ffmpeg/ffmpeg.c

index 235a97917c65604c5e00925e5c1df14a50c43f79..ac6c0506e1a5fe6d23993bde15301bbbd3f38502 100644 (file)
@@ -1084,8 +1084,6 @@ static struct
       VIDEO_ES, "PAM Image" },
     { VLC_FOURCC('t','g','a',' '), CODEC_ID_TARGA,
       VIDEO_ES, "Truevision Targa Image" },
-    { VLC_FOURCC('s','g','i',' '), CODEC_ID_SGI,
-      VIDEO_ES, "BMP Image" },
 
 #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(0<<8)+0)
     { VLC_FOURCC('b','m','p',' '), CODEC_ID_BMP,
@@ -1097,6 +1095,8 @@ static struct
       VIDEO_ES, "TIFF Image" },
     { VLC_FOURCC('g','i','f',' '), CODEC_ID_GIF,
       VIDEO_ES, "GIF Image" },
+    { VLC_FOURCC('s','g','i',' '), CODEC_ID_SGI,
+      VIDEO_ES, "SGI Image" },
 #endif
 
     /*