Mercurial > libavcodec.hg
changeset 12481:e9a1e1ba768f libavcodec
Allow the lowres option to affect audio codecs, too
| author | mstorsjo |
|---|---|
| date | Fri, 10 Sep 2010 06:19:31 +0000 |
| parents | 14896fa76003 |
| children | 8cafb4db28cb |
| files | options.c utils.c |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/options.c Fri Sep 10 02:25:12 2010 +0000 +++ b/options.c Fri Sep 10 06:19:31 2010 +0000 @@ -333,7 +333,7 @@ {"aac_ltp", NULL, 0, FF_OPT_TYPE_CONST, FF_PROFILE_AAC_LTP, INT_MIN, INT_MAX, A|E, "profile"}, {"level", NULL, OFFSET(level), FF_OPT_TYPE_INT, FF_LEVEL_UNKNOWN, INT_MIN, INT_MAX, V|A|E, "level"}, {"unknown", NULL, 0, FF_OPT_TYPE_CONST, FF_LEVEL_UNKNOWN, INT_MIN, INT_MAX, V|A|E, "level"}, -{"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), FF_OPT_TYPE_INT, 0, 0, INT_MAX, V|D}, +{"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), FF_OPT_TYPE_INT, 0, 0, INT_MAX, V|A|D}, {"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"skip_factor", "frame skip factor", OFFSET(frame_skip_factor), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
--- a/utils.c Fri Sep 10 02:25:12 2010 +0000 +++ b/utils.c Fri Sep 10 06:19:31 2010 +0000 @@ -505,8 +505,7 @@ } avctx->frame_number = 0; if(avctx->codec->init){ - if(avctx->codec_type == AVMEDIA_TYPE_VIDEO && - avctx->codec->max_lowres < avctx->lowres){ + if (avctx->codec->max_lowres < avctx->lowres) { av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n", avctx->codec->max_lowres); goto free_and_end;