[SCM] libav/experimental: Try size 640x480 for FLC files which don't specify their size. This is a ugly hack to fix playback of specular.flc. closes issue71

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 77cb22fa7b3f632c16aa3d4e7aa7d47f9cd99f2c
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Tue Aug 14 15:51:30 2007 +0000

    Try size 640x480 for FLC files which don't specify their size.
    This is a ugly hack to fix playback of specular.flc.
    closes issue71
    
    Originally committed as revision 10117 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flic.c b/libavformat/flic.c
index 7ad25c2..a85cb97 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -94,8 +94,14 @@ static int flic_read_header(AVFormatContext *s,
     st->codec->width = AV_RL16(&header[0x08]);
     st->codec->height = AV_RL16(&header[0x0A]);
 
-    if (!st->codec->width || !st->codec->height)
-        return AVERROR_INVALIDDATA;
+    if (!st->codec->width || !st->codec->height) {
+        /* Ugly hack needed for the following sample: */
+        /* http://samples.mplayerhq.hu/fli-flc/fli-bugs/specular.flc */
+        av_log(s, AV_LOG_WARNING,
+               "File with no specified width/height. Trying 640x480.\n");
+        st->codec->width  = 640;
+        st->codec->height = 480;
+    }
 
     /* send over the whole 128-byte FLIC header */
     st->codec->extradata_size = FLIC_HEADER_SIZE;

-- 
Libav/FFmpeg packaging