diff -up osdpip-0.1.2/decoder.h.ffmpeg osdpip-0.1.2/decoder.h
--- osdpip-0.1.2/decoder.h.ffmpeg	2013-01-13 03:07:07.403828292 +0100
+++ osdpip-0.1.2/decoder.h	2013-01-13 03:08:10.466181928 +0100
@@ -34,7 +34,7 @@ extern "C"
   #include <libavcodec/avcodec.h>
   #ifdef USE_SWSCALE
     #include <libswscale/swscale.h>
-    #include <libavcodec/opt.h>
+    #include <libavutil/opt.h>
   #endif
 #else
   #include <ffmpeg/avcodec.h>
diff -up osdpip-0.1.2/osdpip.c.ffmpeg osdpip-0.1.2/osdpip.c
--- osdpip-0.1.2/osdpip.c.ffmpeg	2012-05-16 22:33:45.000000000 +0200
+++ osdpip-0.1.2/osdpip.c	2013-01-13 03:08:01.214276755 +0100
@@ -70,8 +70,6 @@ bool cPluginOsdpip::ProcessArgs(int argc
 
 bool cPluginOsdpip::Initialize(void)
 {
-    // must be called before using avcodec lib
-    avcodec_init();
     // register all the codecs (you can also register only the codec
     // you wish to have smaller code)
     avcodec_register_all();