--- operations/external/ff-load.c.ffmpeg	2012-04-01 11:17:57.000000000 +0000
+++ operations/external/ff-load.c	2012-05-28 08:37:30.000000000 +0000
@@ -271,7 +271,7 @@
       gint err;
 
       ff_cleanup (o);
-      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
+      err = avformat_open_input (&p->ic, o->path, NULL, NULL);
       if (err < 0)
         {
           print_error (o->path, err);
--- operations/workshop/external/ff-save.c.ffmpeg	2012-03-29 20:05:50.000000000 +0000
+++ operations/workshop/external/ff-save.c	2012-05-28 08:56:27.000000000 +0000
@@ -769,26 +769,26 @@
      /*XXX: FOO p->audio_st = add_audio_stream (op, p->oc, p->fmt->audio_codec);*/
     }
 
-  if (av_set_parameters (p->oc, NULL) < 0)
+  if (avformat_write_header (p->oc, NULL) < 0)
     {
       fprintf (stderr, "Invalid output format propeters\n%s", "");
       return -1;
     }
 
-  dump_format (p->oc, 0, self->path, 1);
+  av_dump_format (p->oc, 0, self->path, 1);
 
   if (p->video_st)
     open_video (p, p->oc, p->video_st);
   if (p->audio_st)
     open_audio (p, p->oc, p->audio_st);
 
-  if (url_fopen (&p->oc->pb, self->path, URL_WRONLY) < 0)
+  if (avio_open (&p->oc->pb, self->path, AVIO_FLAG_WRITE) < 0)
     {
       fprintf (stderr, "couldn't open '%s'\n", self->path);
       return -1;
     }
 
-  av_write_header (p->oc);
+  avformat_write_header (p->oc, NULL);
 
   return 0;
 }
@@ -858,7 +858,7 @@
             av_freep (&p->oc->streams[i]);
           }
 
-        url_fclose (&p->oc->pb);
+        avio_close (&p->oc->pb);
         free (p->oc);
       }
       g_free (o->chant_data);