[xine-cvs] CVS: xine-lib/src/libffmpeg xine_decoder.c,1.107,1.108

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv29200/src/libffmpeg

Modified Files:
	xine_decoder.c 
Log Message:
ffmpeg update, add new files/decoders, use our fastmemcpy
tested ok with usual files (wmv7, mpeg4, divx, svq1...)


Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_decoder.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xine_decoder.c	3 Apr 2003 20:48:44 -0000	1.107
+++ xine_decoder.c	16 Apr 2003 00:18:35 -0000	1.108
@@ -592,9 +592,6 @@
 
 	  diff = abs_float( this->context->aspect_ratio - 
 			    (float)this->bih.biWidth/(float)this->bih.biHeight);
-	  /* according to miguel some decoders set aspect_ratio=0,
-	   * stick to XINE_VO_ASPECT_DONT_TOUCH in that case 
-	   */
 	  if ( abs_float (this->context->aspect_ratio) < 0.1 )
 	    diff = 0.0;
 
@@ -640,7 +637,7 @@
 	  img->bad_frame = 1;
 	} else {
 	  img->bad_frame = 0;
-	  
+
 	  pthread_mutex_lock(&this->pp_lock);
 	  if(this->pp_available && this->pp_quality)
 	    pp_postprocess(this->av_frame->data, this->av_frame->linesize, 
@@ -847,21 +844,24 @@
     register_avcodec(&msmpeg4v3_decoder);
     register_avcodec(&wmv1_decoder);
     register_avcodec(&wmv2_decoder);
-    register_avcodec(&mpeg_decoder);
     register_avcodec(&h263i_decoder);
     register_avcodec(&rv10_decoder);
     register_avcodec(&svq1_decoder);
+    register_avcodec(&wmav1_decoder);
+    register_avcodec(&wmav2_decoder);
+    register_avcodec(&indeo3_decoder);
+    register_avcodec(&mpeg_decoder);
     register_avcodec(&dvvideo_decoder);
     register_avcodec(&dvaudio_decoder);
     register_avcodec(&mjpeg_decoder);
     register_avcodec(&mjpegb_decoder);
     register_avcodec(&mp2_decoder);
     register_avcodec(&mp3_decoder);
-    register_avcodec(&wmav1_decoder);
-    register_avcodec(&wmav2_decoder);
     register_avcodec(&mace3_decoder);
     register_avcodec(&mace6_decoder);
     register_avcodec(&huffyuv_decoder);
+    register_avcodec(&cyuv_decoder);
+    register_avcodec(&h264_decoder);
 }
 
 static void ff_dispose (video_decoder_t *this_gen) {