syncing to FFmpeg libavcodec build 4754; hook up the Indeo 2 decoder,

deploy new timebase API (pertains to MPEG-1 encoder); hopefully this
sync fixes some H.264 decoding issues as well

CVS patchset: 7523
CVS date: 2005/05/06 04:22:50

3 files changed, 10 insertions, 7 deletions

diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 957e9da63..103ed6eb2 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.47 2005/04/26 21:11:35 tmattern Exp $
+ * $Id: video_decoder.c,v 1.48 2005/05/06 04:22:51 tmmm Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -262,6 +262,7 @@ static const ff_codec_t ff_video_lookup[] = {
   {BUF_VIDEO_ULTI,        CODEC_ID_ULTI,       "IBM UltiMotion (ffmpeg)"},
   {BUF_VIDEO_WNV1,        CODEC_ID_WNV1,       "Winnow Video (ffmpeg)"},
   {BUF_VIDEO_XL,          CODEC_ID_VIXL,       "Miro/Pinnacle VideoXL (ffmpeg)"},
+  {BUF_VIDEO_RT21,        CODEC_ID_INDEO2,     "Indeo/RealTime 2 (ffmpeg)"},
   {BUF_VIDEO_MPEG,        CODEC_ID_MPEG1VIDEO, "MPEG 1/2 (ffmpeg)"} };
 
 
@@ -1476,6 +1477,7 @@ static uint32_t supported_video_types[] = {
   BUF_VIDEO_ULTI,
   BUF_VIDEO_WNV1,
   BUF_VIDEO_XL,
+  BUF_VIDEO_RT21,
   0 
 };
 
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index b470bfdd8..271502b1f 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.161 2005/04/19 05:22:54 tmmm Exp $
+ * $Id: xine_decoder.c,v 1.162 2005/05/06 04:22:50 tmmm Exp $
  *
  * xine decoder plugin using ffmpeg
  *
@@ -125,6 +125,7 @@ void avcodec_register_all(void)
     register_avcodec(&ulti_decoder);
     register_avcodec(&wnv1_decoder);
     register_avcodec(&xl_decoder);
+    register_avcodec(&indeo2_decoder);
 }
 
 void init_once_routine(void) {
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index 55f5e22ac..e2fb95389 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_encoder.c,v 1.20 2004/12/12 22:01:09 mroi Exp $
+ * $Id: xine_encoder.c,v 1.21 2005/05/06 04:22:51 tmmm Exp $
  */
  
 /* mpeg encoders for the dxr3 video out plugin. */
@@ -196,13 +196,13 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
   this->context->gop_size = 0; /*intra frames only */
   this->context->me_method = ME_ZERO; /*motion estimation type*/
   
-  this->context->frame_rate = 90000;
+  this->context->time_base.den = 90000;
   if (frame->vo_frame.duration > 90000 / 24)
-    this->context->frame_rate_base = 90000 / 24;
+    this->context->time_base.num = 90000 / 24;
   else if (frame->vo_frame.duration < 90000 / 60)
-    this->context->frame_rate_base = 90000 / 60;
+    this->context->time_base.num = 90000 / 60;
   else
-    this->context->frame_rate_base = frame->vo_frame.duration;
+    this->context->time_base.num = frame->vo_frame.duration;
   /* ffmpeg can complain about illegal framerates, but since this seems no
    * problem for the DXR3, we just tell ffmpeg to be more lax with */
   this->context->strict_std_compliance = -1;