Mercurial > mplayer.hg
comparison libmpcodecs/vd_ffmpeg.c @ 26166:da6f8ef92918
Grayscale encoding/decoding with FFmpeg is no longer enabled, remove references
from the documentation and the relevant options from the glue code.
author | diego |
---|---|
date | Fri, 07 Mar 2008 21:30:01 +0000 |
parents | 1318e956c092 |
children | 71bd93e71a97 |
comparison
equal
deleted
inserted
replaced
26165:32fda5bc7d58 | 26166:da6f8ef92918 |
---|---|
69 #endif | 69 #endif |
70 | 70 |
71 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; | 71 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; |
72 static int lavc_param_error_resilience=2; | 72 static int lavc_param_error_resilience=2; |
73 static int lavc_param_error_concealment=3; | 73 static int lavc_param_error_concealment=3; |
74 static int lavc_param_gray=0; | |
75 static int lavc_param_vstats=0; | 74 static int lavc_param_vstats=0; |
76 static int lavc_param_idct_algo=0; | 75 static int lavc_param_idct_algo=0; |
77 static int lavc_param_debug=0; | 76 static int lavc_param_debug=0; |
78 static int lavc_param_vismv=0; | 77 static int lavc_param_vismv=0; |
79 static int lavc_param_skip_top=0; | 78 static int lavc_param_skip_top=0; |
88 static int lavc_param_bitexact=0; | 87 static int lavc_param_bitexact=0; |
89 | 88 |
90 const m_option_t lavc_decode_opts_conf[]={ | 89 const m_option_t lavc_decode_opts_conf[]={ |
91 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, | 90 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, |
92 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, | 91 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
93 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, | |
94 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, | 92 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
95 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, | 93 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
96 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 94 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
97 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, | 95 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, |
98 {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, | 96 {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, |
286 | 284 |
287 avctx->width = sh->disp_w; | 285 avctx->width = sh->disp_w; |
288 avctx->height= sh->disp_h; | 286 avctx->height= sh->disp_h; |
289 avctx->workaround_bugs= lavc_param_workaround_bugs; | 287 avctx->workaround_bugs= lavc_param_workaround_bugs; |
290 avctx->error_resilience= lavc_param_error_resilience; | 288 avctx->error_resilience= lavc_param_error_resilience; |
291 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; | |
292 #ifdef CODEC_FLAG2_FAST | 289 #ifdef CODEC_FLAG2_FAST |
293 avctx->flags2|= lavc_param_fast; | 290 avctx->flags2|= lavc_param_fast; |
294 #endif | 291 #endif |
295 avctx->codec_tag= sh->format; | 292 avctx->codec_tag= sh->format; |
296 avctx->stream_codec_tag= sh->video.fccHandler; | 293 avctx->stream_codec_tag= sh->video.fccHandler; |