[FFmpeg-cvslog] r25094 - in trunk/libavcodec: options.c utils.c

[mstorsjo]

Author: mstorsjo
Date: Fri Sep 10 08:19:31 2010
New Revision: 25094

Log:
Allow the lowres option to affect audio codecs, too

Modified:
   trunk/libavcodec/options.c
   trunk/libavcodec/utils.c

Modified: trunk/libavcodec/options.c
==============================================================================
--- trunk/libavcodec/options.c	Fri Sep 10 05:31:24 2010	(r25093)
+++ trunk/libavcodec/options.c	Fri Sep 10 08:19:31 2010	(r25094)
@@ -333,7 +333,7 @@ static const AVOption options[]={
 {"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},

Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c	Fri Sep 10 05:31:24 2010	(r25093)
+++ trunk/libavcodec/utils.c	Fri Sep 10 08:19:31 2010	(r25094)
@@ -505,8 +505,7 @@ int attribute_align_arg avcodec_open(AVC
     }
     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;