diff -Naur jffmpeg-org/src/cpp/decoder.c jffmpeg/src/cpp/decoder.c
--- jffmpeg-org/src/cpp/decoder.c	2006-12-12 16:49:36.000000000 +0100
+++ jffmpeg/src/cpp/decoder.c	2006-12-12 16:49:56.000000000 +0100
@@ -34,7 +34,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <jni.h>
-#include <libavcodec/avcodec.h>
+#include <ffmpeg/avcodec.h>
+#include "allcodecs.h"
 #include "net_sourceforge_jffmpeg_ffmpegnative_NativeDecoder.h"
 #include "jffmpeg.h"
 #include "yuv2rgb.h"
@@ -162,7 +162,7 @@
 
     ctx->workaround_bugs = 0; // no workaround for buggy H.263 implementations
     ctx->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
-    ctx->error_resilience = FF_ER_CAREFULL;
+    ctx->error_resilience = FF_ER_CAREFUL;
 
     if (wrapper->rtp_mode)
         ctx->flags |= CODEC_FLAG_RFC2190;
@@ -382,5 +382,5 @@
     wrapper = (FFMPEGWrapper *) peer;
     ctx = wrapper->codec_context;
     pict = wrapper->picture;
-    return (jfloat)((float)ctx->frame_rate/(float)ctx->frame_rate_base);
+    return (jfloat)((float)ctx->time_base.den/(float)ctx->time_base.num);
 }
diff -Naur jffmpeg-org/src/cpp/encoder.c jffmpeg/src/cpp/encoder.c
--- jffmpeg-org/src/cpp/encoder.c	2006-12-12 16:49:36.000000000 +0100
+++ jffmpeg/src/cpp/encoder.c	2006-12-12 16:49:56.000000000 +0100
@@ -35,7 +35,8 @@
 #include <string.h>
 #include <assert.h>
 #include <jni.h>
-#include <libavcodec/avcodec.h>
+#include <ffmpeg/avcodec.h>
+#include "allcodecs.h"
 #include "net_sourceforge_jffmpeg_ffmpegnative_NativeEncoder.h"
 #include "jffmpeg.h"
 
@@ -285,8 +285,8 @@
     ctx->width  = width;
     ctx->height = height;
 
-    ctx->frame_rate = frameRate;
-    ctx->frame_rate_base= 1;
+    ctx->time_base.den = frameRate;
+    ctx->time_base.num = 1;
 
     ctx->gop_size = keyFrameInterval;
 
@@ -417,7 +417,8 @@
     if (!wrapper->codec_context)
         return (jboolean) 0;
 
-    wrapper->codec_context->frame_rate = frameRate;
+    wrapper->codec_context->time_base.num = 1;
+    wrapper->codec_context->time_base.den = frameRate;
 
     return (jboolean) 1;
 }
diff -Naur jffmpeg-org/src/cpp/jffmpeg.h jffmpeg/src/cpp/jffmpeg.h
--- jffmpeg-org/src/cpp/jffmpeg.h	2006-12-12 16:49:36.000000000 +0100
+++ jffmpeg/src/cpp/jffmpeg.h	2006-12-12 16:49:56.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef __JFFMPEG_H__
 #define __JFFMPEG_H__
 
-#include <libavcodec/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #include "yuv2rgb.h"
 
 #define J_H263 "h263"