github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 21:07:29 +01:00
Code Releases Activity

vstrict=-1 is now less "dangerous", make it default and remove m/ljpeg encoding colorspace hack

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15386 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-05-09 20:04:12 +00:00
parent 313cc2c955
commit 51d07d0ea2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DOCS/man/en/mplayer.1
View File

@ -6559,17 +6559,20 @@ JVT recommendation
.PD 1 .PD 1
. .
.TP .TP
.B vstrict=<-1|0|1> .B vstrict=<-2|-1|0|1>
strict standard compliance strict standard compliance
.PD 0 .PD 0
.RSs .RSs
.IPs 0 .IPs 0
disabled (default) disabled
.IPs 1 .IPs 1
Only recommended if you want to feed the output into the Only recommended if you want to feed the output into the
MPEG-4 reference decoder. MPEG-4 reference decoder.
.IPs -1 .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 .RE
.PD 1 .PD 1
. .

7
libmpcodecs/ve_lavc.c
View File

@ -80,7 +80,7 @@ static int lavc_param_vb_strategy = 0;
static int lavc_param_luma_elim_threshold = 0; static int lavc_param_luma_elim_threshold = 0;
static int lavc_param_chroma_elim_threshold = 0; static int lavc_param_chroma_elim_threshold = 0;
static int lavc_param_packet_size= 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_data_partitioning= 0;
static int lavc_param_gray=0; static int lavc_param_gray=0;
static float lavc_param_rc_qsquish=1.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) switch(lavc_param_format)
{ {
case IMGFMT_YV12: 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; lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
break; break;
case IMGFMT_422P: case IMGFMT_422P: