--- server/mp4live/video_ffmpeg.cpp.orig	2007-01-30 22:53:45.000000000 +0100
+++ server/mp4live/video_ffmpeg.cpp	2011-06-25 11:45:14.444347677 +0200
@@ -121,9 +121,6 @@
   m_avctx->bit_rate = 
     Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE) * 1000;
 #ifndef HAVE_AVCODECCONTEXT_TIME_BASE
-  m_avctx->frame_rate = (int)(Profile()->GetFloatValue(CFG_VIDEO_FRAME_RATE) + 0.5);
-  m_avctx->frame_rate_base = 1;
-#else
   m_avctx->time_base = (AVRational){1, (int)(Profile()->GetFloatValue(CFG_VIDEO_FRAME_RATE) + .5)};
   m_avctx->pix_fmt = PIX_FMT_YUV420P;
   m_avctx->me_method = ME_EPZS;
@@ -131,9 +128,9 @@
   if (Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH) > 0 &&
       Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT) > 0) {
 #ifndef HAVE_AVRATIONAL
-    float asp = (float)Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH);
-    asp /= (float)Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT);
-    m_avctx->aspect_ratio = asp;
+     AVRational asp =      {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH),
+       Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT)};   
+       m_avctx->sample_aspect_ratio = asp;
 #else
     AVRational asp = 
       {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH),
@@ -224,8 +221,8 @@
     }
   }
   if (wantKeyFrame) m_picture->pict_type = FF_I_TYPE; //m_picture->key_frame = 1;
   else //m_picture->key_frame = 0;
-    m_picture->pict_type = 0;
+    m_picture->pict_type = AV_PICTURE_TYPE_NONE;
 
   m_picture->data[0] = (uint8_t *)pY;
   m_picture->data[1] = (uint8_t *)pU;