[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.81,1.82

[Richard Felker CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv3761/libmpcodecs

Modified Files:
	vd_ffmpeg.c 
Log Message:
I hope this works as expected with old lavc versions. At least it compiles now.


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vd_ffmpeg.c	28 Dec 2002 12:14:57 -0000	1.81
+++ vd_ffmpeg.c	11 Jan 2003 05:06:48 -0000	1.82
@@ -45,6 +45,11 @@
 #define coded_frame coded_picture
 #endif
 
+#if LIBAVCODEC_BUILD < 4654
+#define PIX_FMT_RGB24 PIX_FMT_BGR24
+#define PIX_FMT_RGBA32 PIX_FMT_BGRA32
+#endif
+
 int avcodec_inited=0;
 
 #if defined(FF_POSTPROCESS) && defined(MBR)
@@ -350,8 +355,8 @@
 	case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg
 	case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc
 	case PIX_FMT_YUV422:  ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future
-	case PIX_FMT_BGR24 :  ctx->best_csp=IMGFMT_BGR24;break; //huffyuv
-	case PIX_FMT_BGRA32:  ctx->best_csp=IMGFMT_BGR32;break; //huffyuv
+	case PIX_FMT_RGB24 :  ctx->best_csp=IMGFMT_BGR24;break; //huffyuv
+	case PIX_FMT_RGBA32:  ctx->best_csp=IMGFMT_BGR32;break; //huffyuv
 	default:
 	    ctx->best_csp=0;
 	}