Mercurial > mplayer.hg
changeset 15385:6e455aec9cca
vstrict=-1 is now less "dangerous", make it default and remove m/ljpeg encoding colorspace hack
| author | reimar |
|---|---|
| date | Mon, 09 May 2005 20:04:12 +0000 |
| parents | 0189ac5804b9 |
| children | 3eb54388bdc5 |
| files | DOCS/man/en/mplayer.1 libmpcodecs/ve_lavc.c |
| diffstat | 2 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Mon May 09 19:46:49 2005 +0000 +++ b/DOCS/man/en/mplayer.1 Mon May 09 20:04:12 2005 +0000 @@ -6559,17 +6559,20 @@ .PD 1 . .TP -.B vstrict=<-1|0|1> +.B vstrict=<-2|-1|0|1> strict standard compliance .PD 0 .RSs .IPs 0 -disabled (default) +disabled .IPs 1 Only recommended if you want to feed the output into the MPEG-4 reference decoder. .IPs -1 -Allows some non-standard codecs to work (snow, ffvhuff, ffv1). +Allow libavcodec specific extensions (default) +.IPs -2 +Enables experimental codecs and features which might not play back with +later MPlayer versions (snow, ffvhuff, ffv1). .RE .PD 1 .
--- a/libmpcodecs/ve_lavc.c Mon May 09 19:46:49 2005 +0000 +++ b/libmpcodecs/ve_lavc.c Mon May 09 20:04:12 2005 +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: