Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 21:33:09 +0000 (22:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 21:35:41 +0000 (22:35 +0100)
* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
  aacdec: add default case in channel layout

Conflicts:
libavcodec/aacdec.c

Note, the default case is currently unreachable

See: a48b890392aa22033f182421ba9e3f3b3256461d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacdec.c

@@@ -703,7 -625,8 +703,8 @@@ static void decode_channel_map(uint8_t 
              syn_ele = TYPE_LFE;
              break;
          default:
 -            return;
+             // AAC_CHANNEL_OFF has no channel map
 +            av_assert0(0);
          }
          layout_map[0][0] = syn_ele;
          layout_map[0][1] = get_bits(gb, 4);