[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.58,1.59

[Michael Niedermayer]

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

Modified Files:
	vd_ffmpeg.c 
Log Message:
new error resilience support
 option renamed for consitancy with ffmpeg (ver -> er)
 bug numbers changed (1234->1248) as some files need multiple ones 


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vd_ffmpeg.c	7 Oct 2002 21:57:43 -0000	1.58
+++ vd_ffmpeg.c	13 Oct 2002 13:49:08 -0000	1.59
@@ -56,8 +56,13 @@
 
 static void get_buffer(struct AVCodecContext *avctx, int width, int height, int pict_type);
 
-static int lavc_param_workaround_bugs=0;
-static int lavc_param_error_resilience=-1;
+#ifdef FF_BUG_AUTODETECT
+static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
+#else
+static int lavc_param_workaround_bugs= 0;
+#endif
+static int lavc_param_error_resilience=2;
+static int lavc_param_error_concealment=3;
 static int lavc_param_gray=0;
 static int lavc_param_vstats=0;
 static int lavc_param_idct_algo=0;
@@ -65,7 +70,7 @@
 struct config lavc_decode_opts_conf[]={
 #if LIBAVCODEC_BUILD >= 4611
 	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
-	{"ver", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
+	{"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 #endif
 #if LIBAVCODEC_BUILD >= 4614
 	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
@@ -73,6 +78,9 @@
 #if LIBAVCODEC_BUILD >= 4629
 	{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 #endif
+#if LIBAVCODEC_BUILD >= 4631
+	{"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
+#endif
 	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
@@ -169,6 +177,9 @@
 #endif
 #if LIBAVCODEC_BUILD >= 4629
     avctx->idct_algo= lavc_param_idct_algo;
+#endif
+#if LIBAVCODEC_BUILD >= 4631
+    avctx->error_concealment= lavc_param_error_concealment;
 #endif
     
     mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);