[MPlayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.113,1.114

[Reimar Döffinger]

Hi,
On Mon, May 09, 2005 at 03:07:42AM +0200, Michael Niedermayer wrote:
> i meant that i splited the double meaning strict=-1 into
> -1 -> "unofficial extension" 
> -2 -> "might not be playable in later versions"

That is a solution I like. I suggest the attached patch (that sets
strict=-1 by default and removes the colorspace hack).

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libmpcodecs/ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.115
diff -u -r1.115 ve_lavc.c
--- libmpcodecs/ve_lavc.c	8 May 2005 20:51:38 -0000	1.115
+++ libmpcodecs/ve_lavc.c	9 May 2005 08:05:11 -0000
@@ -80,7 +80,7 @@
 static int lavc_param_luma_elim_threshold = 0;
 static int lavc_param_chroma_elim_threshold = 0;
 static int lavc_param_packet_size= 0;
-static int lavc_param_strict= 0;
+static int lavc_param_strict= -1;
 static int lavc_param_data_partitioning= 0;
 static int lavc_param_gray=0;
 static float lavc_param_rc_qsquish=1.0;
@@ -620,11 +620,6 @@
     switch(lavc_param_format)
     {
 	case IMGFMT_YV12:
-	    // HACK, mjpeg accepts PIX_FMT_YUV420P only with vstrict=-1
-	    if (strcasecmp(lavc_param_vcodec, "mjpeg") == 0 ||
-	        strcasecmp(lavc_param_vcodec, "ljpeg") == 0)
-	      lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
-	    else
 	    lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
 	    break;
 	case IMGFMT_422P: