OSDN Git Service

Do not reset channel_layout to 0.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 25 May 2011 07:43:14 +0000 (09:43 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 25 May 2011 07:49:18 +0000 (09:49 +0200)
The channel_layout may have been set by the demuxer.

libavcodec/aacdec.c

index c56c0af..19d3b36 100644 (file)
@@ -251,8 +251,6 @@ static av_cold int output_configure(AACContext *ac,
         }
 
         memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
-
-        avctx->channel_layout = 0;
     }
 
     avctx->channels = channels;