Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jun 2015 17:23:06 +0000 (19:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jun 2015 17:23:34 +0000 (19:23 +0200)
* commit '0289f81241e720452b5a77713488d54d3ec252d7':
  aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

Conflicts:
libavcodec/aacdec.c

Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacdec.c

@@@ -485,9 -479,7 +493,8 @@@ static int output_configure(AACContext 
          }
      }
  
-     memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
 -    avctx->channel_layout = ac->oc[1].channel_layout = layout;
 +    if (layout) avctx->channel_layout = layout;
 +                            ac->oc[1].channel_layout = layout;
      avctx->channels       = ac->oc[1].channels       = channels;
      ac->oc[1].status = oc_type;