Merge commit '141c960e21d2860e354f9b90df136184dd00a9a8'

* commit '141c960e21d2860e354f9b90df136184dd00a9a8':
  libfdk-aacenc: Fix building with libfdk-aac v2

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/libfdk-aacenc.c
index 25d33fec18585bd1b79ad06b22fe4b6eb7af51bf,2ad768ed44ef6dde9e692a2b91f85a8222137123..df6f7e7a742d35445d382f628d90287154599459
--- 1/libavcodec/libfdk-aacenc.c
--- 2/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@@ -345,9 -354,18 +354,16 @@@ static int aac_encode_frame(AVCodecCont
              return ret;
      }
  
+     in_buffer_element_size   = 2;
+     in_buf.numBufs           = 1;
+     in_buf.bufs              = &in_ptr;
+     in_buf.bufferIdentifiers = &in_buffer_identifier;
+     in_buf.bufSizes          = &in_buffer_size;
+     in_buf.bufElSizes        = &in_buffer_element_size;
+ 
      /* The maximum packet size is 6144 bits aka 768 bytes per channel. */
 -    if ((ret = ff_alloc_packet(avpkt, FFMAX(8192, 768 * avctx->channels)))) {
 -        av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
 +    if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels), 0)) < 0)
          return ret;
 -    }
  
      out_ptr                   = avpkt->data;
      out_buffer_size           = avpkt->size;