[FFmpeg-cvslog] r25090 - trunk/ffmpeg.c

[mstorsjo]

Author: mstorsjo
Date: Thu Sep  9 22:58:13 2010
New Revision: 25090

Log:
Update the audio sample rate when doing lowres audio decoding, before opening the decoder

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Thu Sep  9 22:23:41 2010	(r25089)
+++ trunk/ffmpeg.c	Thu Sep  9 22:58:13 2010	(r25090)
@@ -3241,6 +3241,11 @@ static void opt_input_file(const char *f
             input_codecs[nb_icodecs++] = avcodec_find_decoder_by_name(audio_codec_name);
             if(audio_disable)
                 st->discard= AVDISCARD_ALL;
+            /* Note that av_find_stream_info can add more streams, and we
+             * currently have no chance of setting up lowres decoding
+             * early enough for them. */
+            if (dec->lowres)
+                audio_sample_rate >>= dec->lowres;
             break;
         case AVMEDIA_TYPE_VIDEO:
             set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_VIDEO], AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM);