diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-09 20:04:12 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-09 20:04:12 +0000 |
| commit | 51d07d0ea2e41d9914df92da223a45f4f6980771 (patch) | |
| tree | d13a20d0f385e41fdce80a801e6510aee3791729 | |
| parent | 313cc2c9553050df45f83d27e18aab9860c8e177 (diff) | |
| download | mpv-51d07d0ea2e41d9914df92da223a45f4f6980771.tar.bz2 mpv-51d07d0ea2e41d9914df92da223a45f4f6980771.tar.xz | |
vstrict=-1 is now less "dangerous", make it default and remove m/ljpeg encoding colorspace hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15386 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 9 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 80f16e376e..8a5dfd1595 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -6559,17 +6559,20 @@ JVT recommendation .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 . diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 941d866897..dbe0d0c56e 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -80,7 +80,7 @@ static int lavc_param_vb_strategy = 0; 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 @@ static int config(struct vf_instance_s* vf, 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: |