Merge commit '0ee2573347ecdb9cb5656001f7201d819eec16d8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:31:24 +0000 (13:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:31:24 +0000 (13:31 +0100)
* commit '0ee2573347ecdb9cb5656001f7201d819eec16d8':
  aacdec: Support for ER AAC in LATM

Conflicts:
libavcodec/aacdec.c

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

@@@ -3429,7 -3235,17 +3429,17 @@@ static int latm_decode_frame(AVCodecCon
          return AVERROR_INVALIDDATA;
      }
  
-     if ((err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb, avpkt)) < 0)
+     switch (latmctx->aac_ctx.oc[1].m4ac.object_type) {
+     case AOT_ER_AAC_LC:
+     case AOT_ER_AAC_LTP:
+     case AOT_ER_AAC_LD:
+     case AOT_ER_AAC_ELD:
+         err = aac_decode_er_frame(avctx, out, got_frame_ptr, &gb);
+         break;
+     default:
 -        err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb);
++        err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb, avpkt);
+     }
+     if (err < 0)
          return err;
  
      return muxlength;