Mercurial > mplayer.hg
comparison libmpcodecs/vd_ffmpeg.c @ 34524:5392905aa13c
Remove some nonsensical uses of CODEC_FLAG_PART.
| author | reimar |
|---|---|
| date | Sat, 28 Jan 2012 10:44:08 +0000 |
| parents | 0481efcf5489 |
| children | 123345d17f3a |
comparison
equal
deleted
inserted
replaced
| 34523:0481efcf5489 | 34524:5392905aa13c |
|---|---|
| 113 }; | 113 }; |
| 114 | 114 |
| 115 const m_option_t lavc_decode_opts_conf[]={ | 115 const m_option_t lavc_decode_opts_conf[]={ |
| 116 {"bug" , &lavc_param_workaround_bugs , CONF_TYPE_INT , CONF_RANGE, -1, 999999, NULL}, | 116 {"bug" , &lavc_param_workaround_bugs , CONF_TYPE_INT , CONF_RANGE, -1, 999999, NULL}, |
| 117 {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, | 117 {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, |
| 118 {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_PART, NULL}, | 118 {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_GRAY, NULL}, |
| 119 {"idct" , &lavc_param_idct_algo , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, | 119 {"idct" , &lavc_param_idct_algo , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, |
| 120 {"ec" , &lavc_param_error_concealment , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, | 120 {"ec" , &lavc_param_error_concealment , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, |
| 121 {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL}, | 121 {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL}, |
| 122 {"debug" , &lavc_param_debug , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, | 122 {"debug" , &lavc_param_debug , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, |
| 123 {"vismv" , &lavc_param_vismv , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, | 123 {"vismv" , &lavc_param_vismv , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, |
| 124 #ifdef CODEC_FLAG2_SHOW_ALL | 124 #ifdef CODEC_FLAG2_SHOW_ALL |
| 125 {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_PART, NULL}, | 125 {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, 1, NULL}, |
| 126 #endif | 126 #endif |
| 127 {"st" , &lavc_param_skip_top , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, | 127 {"st" , &lavc_param_skip_top , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, |
| 128 {"sb" , &lavc_param_skip_bottom , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, | 128 {"sb" , &lavc_param_skip_bottom , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, |
| 129 {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG2_FAST, NULL}, | 129 {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG2_FAST, NULL}, |
| 130 {"lowres" , &lavc_param_lowres_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, | 130 {"lowres" , &lavc_param_lowres_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, |
| 265 | 265 |
| 266 avctx->coded_width = sh->disp_w; | 266 avctx->coded_width = sh->disp_w; |
| 267 avctx->coded_height= sh->disp_h; | 267 avctx->coded_height= sh->disp_h; |
| 268 avctx->workaround_bugs= lavc_param_workaround_bugs; | 268 avctx->workaround_bugs= lavc_param_workaround_bugs; |
| 269 avctx->error_recognition= lavc_param_error_resilience; | 269 avctx->error_recognition= lavc_param_error_resilience; |
| 270 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; | 270 lavc_param_gray|= CODEC_FLAG_GRAY; |
| 271 #ifdef CODEC_FLAG2_SHOW_ALL | 271 #ifdef CODEC_FLAG2_SHOW_ALL |
| 272 if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; | 272 if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; |
| 273 #endif | 273 #endif |
| 274 avctx->flags2|= lavc_param_fast; | 274 avctx->flags2|= lavc_param_fast; |
| 275 avctx->codec_tag= sh->format; | 275 avctx->codec_tag= sh->format; |