[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.83,1.84 ad_ffmpeg.c,1.12,1.13

[Michael Niedermayer CVS]

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

Modified Files:
	vd_ffmpeg.c ad_ffmpeg.c 
Log Message:
merging fourcc with codec_tag


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vd_ffmpeg.c	11 Feb 2003 20:21:52 -0000	1.83
+++ vd_ffmpeg.c	8 Mar 2003 02:05:14 -0000	1.84
@@ -90,7 +90,7 @@
 static int lavc_param_debug=0;
 
 struct config lavc_decode_opts_conf[]={
-	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
+	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
 	{"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
 	{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
@@ -186,7 +186,7 @@
     avctx->workaround_bugs= lavc_param_workaround_bugs;
     avctx->error_resilience= lavc_param_error_resilience;
     if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
-    avctx->fourcc= sh->format;
+    avctx->codec_tag= sh->format;
     avctx->idct_algo= lavc_param_idct_algo;
     avctx->error_concealment= lavc_param_error_concealment;
 #if LIBAVCODEC_BUILD >= 4642
@@ -540,7 +540,7 @@
     ret = avcodec_decode_video(avctx, pic,
 	     &got_picture, data, len);
     if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n");
-
+//printf("repeat: %d\n", pic->repeat_pict);
 //-- vstats generation
 #if LIBAVCODEC_BUILD >= 4643
     while(lavc_param_vstats){ // always one time loop

Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ad_ffmpeg.c	28 Dec 2002 00:40:11 -0000	1.12
+++ ad_ffmpeg.c	8 Mar 2003 02:05:14 -0000	1.13
@@ -67,7 +67,7 @@
 	lavc_context->bit_rate = sh_audio->wf->nAvgBytesPerSec * 8;
 	lavc_context->block_align = sh_audio->wf->nBlockAlign;
     }
-    lavc_context->fourcc = sh_audio->format;
+    lavc_context->codec_tag = sh_audio->format; //FOURCC
     lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi
 
     /* alloc extra data */