--- operations/external/ff-load.c.org	2011-02-10 00:40:14.550999993 +0100
+++ operations/external/ff-load.c	2011-09-06 15:13:16.053755612 +0200
@@ -69,7 +69,7 @@
 {
   switch (err)
     {
-    case AVERROR_NUMEXPECTED:
+    case AVERROR(EINVAL):
       g_warning ("%s: Incorrect image filename syntax.\n"
                  "Use '%%d' to specify the image number:\n"
                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
@@ -77,10 +77,7 @@
                  filename);
       break;
     case AVERROR_INVALIDDATA:
-      g_warning ("%s: Error while parsing header\n", filename);
-      break;
-    case AVERROR_NOFMT:
-      g_warning ("%s: Unknown format\n", filename);
+      g_warning ("%s: Error while parsing header or unknown format\n", filename);
       break;
     default:
       g_warning ("%s: Error while opening file\n", filename);
@@ -278,7 +275,7 @@
       for (i = 0; i< p->ic->nb_streams; i++)
         {
           AVCodecContext *c = p->ic->streams[i]->codec;
-          if (c->codec_type == CODEC_TYPE_VIDEO)
+          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
             {
               p->video_st = p->ic->streams[i];
               p->video_stream = i;
