X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faudiotoolboxdec.c;h=a4fb8c91209029a66c8735de473880c325b607c0;hb=ef6a9e5e311f09fa8032974fa4d0c1e166a959bb;hp=5c0a9de8f636fe0516808c56b1aa4ec079d09034;hpb=39278ff0de5b5e3397c22538978bffbb38ee099b;p=ffmpeg

diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
index 5c0a9de8f63..a4fb8c91209 100644
--- a/libavcodec/audiotoolboxdec.c
+++ b/libavcodec/audiotoolboxdec.c
@@ -1,7 +1,7 @@
 /*
  * Audio Toolbox system codecs
  *
- * copyright (c) 2016 Rodger Combs
+ * copyright (c) 2016 rcombs
  *
  * This file is part of FFmpeg.
  *
@@ -296,7 +296,8 @@ static int ffat_set_extradata(AVCodecContext *avctx)
     return 0;
 }
 
-static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt)
+static av_cold int ffat_create_decoder(AVCodecContext *avctx,
+                                       const AVPacket *pkt)
 {
     ATDecodeContext *at = avctx->priv_data;
     OSStatus status;
@@ -483,7 +484,7 @@ static int ffat_decode(AVCodecContext *avctx, void *data,
     if (avctx->codec_id == AV_CODEC_ID_AAC) {
         if (!at->extradata_size) {
             uint8_t *side_data;
-            int side_data_size = 0;
+            size_t side_data_size;
 
             side_data = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA,
                                                 &side_data_size);
@@ -539,11 +540,6 @@ static int ffat_decode(AVCodecContext *avctx, void *data,
         *got_frame_ptr = 1;
         if (at->last_pts != AV_NOPTS_VALUE) {
             frame->pts = at->last_pts;
-#if FF_API_PKT_PTS
-FF_DISABLE_DEPRECATION_WARNINGS
-            frame->pkt_pts = at->last_pts;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
             at->last_pts = avpkt->pts;
         }
     } else if (ret && ret != 1) {
@@ -595,7 +591,7 @@ static av_cold int ffat_close_decoder(AVCodecContext *avctx)
         .flush          = ffat_decode_flush, \
         .priv_class     = &ffat_##NAME##_dec_class, \
         .bsfs           = bsf_name, \
-        .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, \
+        .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, \
         .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, \
         .wrapper_name   = "at", \
     };