diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 7de8ff8277..2c129bc5dc 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -25,12 +25,20 @@ static ad_info_t info =
 LIBAD_EXTERN(ffmpeg)
 
 #define assert(x)
-#include "../libavcodec/avcodec.h"
 
-static AVCodec *lavc_codec=NULL;
-static AVCodecContext lavc_context;
+#ifdef USE_LIBAVCODEC_SO
+#include <libffmpeg/avcodec.h>
+#else
+#include "libavcodec/avcodec.h"
+#endif
+
 extern int avcodec_inited;
 
+typedef struct {
+    AVCodec *lavc_codec;
+    AVCodecContext *lavc_context;
+} ad_ffmpeg_ctx;
+
 static int preinit(sh_audio_t *sh)
 {
   sh->audio_out_minsize=AVCODEC_MAX_AUDIO_FRAME_SIZE;
@@ -39,21 +47,32 @@ static int preinit(sh_audio_t *sh)
 
 static int init(sh_audio_t *sh_audio)
 {
-   int x;
-   mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n");
+    int x;
+    ad_ffmpeg_ctx *ctx;
+
+    mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n");
     if(!avcodec_inited){
       avcodec_init();
       avcodec_register_all();
       avcodec_inited=1;
     }
-    lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll);
-    if(!lavc_codec){
+    
+    ctx = sh_audio->context = malloc(sizeof(ad_ffmpeg_ctx));
+    if (!ctx)
+	return(0);
+    memset(ctx, 0, sizeof(ad_ffmpeg_ctx));
+    
+    ctx->lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll);
+    if(!ctx->lavc_codec){
 	mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_audio->codec->dll);
 	return 0;
     }
-    memset(&lavc_context, 0, sizeof(lavc_context));
+    
+    ctx->lavc_context = malloc(sizeof(AVCodecContext));
+    memset(ctx->lavc_context, 0, sizeof(AVCodecContext));
+    
     /* open it */
-    if (avcodec_open(&lavc_context, lavc_codec) < 0) {
+    if (avcodec_open(ctx->lavc_context, ctx->lavc_codec) < 0) {
         mp_msg(MSGT_DECAUDIO,MSGL_ERR, MSGTR_CantOpenCodec);
         return 0;
     }
@@ -64,9 +83,9 @@ static int init(sh_audio_t *sh_audio)
    if(x>0) sh_audio->a_buffer_len=x;
 
 #if 1
-  sh_audio->channels=lavc_context.channels;
-  sh_audio->samplerate=lavc_context.sample_rate;
-  sh_audio->i_bps=lavc_context.bit_rate/8;
+  sh_audio->channels=ctx->lavc_context->channels;
+  sh_audio->samplerate=ctx->lavc_context->sample_rate;
+  sh_audio->i_bps=ctx->lavc_context->bit_rate/8;
 #else
   sh_audio->channels=sh_audio->wf->nChannels;
   sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
@@ -77,7 +96,14 @@ static int init(sh_audio_t *sh_audio)
 
 static void uninit(sh_audio_t *sh)
 {
-  avcodec_close(&lavc_context);
+    ad_ffmpeg_ctx *ctx = sh->context;
+    
+    if (avcodec_close(ctx->lavc_context) < 0)
+	mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec);
+    if (ctx->lavc_context)
+	free(ctx->lavc_context);
+    if (ctx)
+	free(ctx);
 }
 
 static int control(sh_audio_t *sh,int cmd,void* arg, ...)
@@ -88,13 +114,14 @@ static int control(sh_audio_t *sh,int cmd,void* arg, ...)
 
 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
 {
+    ad_ffmpeg_ctx *ctx = sh_audio->context;
     unsigned char *start=NULL;
     int y,len=-1;
     while(len<minlen){
 	int len2=0;
 	int x=ds_get_packet(sh_audio->ds,&start);
 	if(x<=0) break; // error
-	y=avcodec_decode_audio(&lavc_context,(INT16*)buf,&len2,start,x);
+	y=avcodec_decode_audio(ctx->lavc_context,(INT16*)buf,&len2,start,x);
 	if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; }
 	if(y<x) sh_audio->ds->buffer_pos+=y-x;  // put back data (HACK!)
 	if(len2>0){