[xine-cvs] CVS: xine-lib/src/libffmpeg xine_decoder.c,1.161,1.162 xine_encoder.c,1.20,1.21 video_decoder.c,1.47,1.48

[Mike M. <tm...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18505

Modified Files:
	xine_decoder.c xine_encoder.c video_decoder.c 
Log Message:
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


Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_decoder.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- xine_decoder.c	19 Apr 2005 05:22:54 -0000	1.161
+++ xine_decoder.c	6 May 2005 04:22:50 -0000	1.162
@@ -125,6 +125,7 @@
     register_avcodec(&ulti_decoder);
     register_avcodec(&wnv1_decoder);
     register_avcodec(&xl_decoder);
+    register_avcodec(&indeo2_decoder);
 }
 
 void init_once_routine(void) {

Index: xine_encoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_encoder.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xine_encoder.c	12 Dec 2004 22:01:09 -0000	1.20
+++ xine_encoder.c	6 May 2005 04:22:51 -0000	1.21
@@ -196,13 +196,13 @@
   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;

Index: video_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/video_decoder.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- video_decoder.c	26 Apr 2005 21:11:35 -0000	1.47
+++ video_decoder.c	6 May 2005 04:22:51 -0000	1.48
@@ -262,6 +262,7 @@
   {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 @@
   BUF_VIDEO_ULTI,
   BUF_VIDEO_WNV1,
   BUF_VIDEO_XL,
+  BUF_VIDEO_RT21,
   0 
 };