Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / aptx.c

diff --git a/libavcodec/aptx.c b/libavcodec/aptx.c
index f2604be..ed814ad 100644 (file)
--- a/libavcodec/aptx.c
+++ b/libavcodec/aptx.c
@@ -516,15 +516,6 @@ av_cold int ff_aptx_init(AVCodecContext *avctx)
     s->hd = avctx->codec->id == AV_CODEC_ID_APTX_HD;
     s->block_size = s->hd ? 6 : 4;
 
-    if (avctx->frame_size == 0)
-        avctx->frame_size = 256 * s->block_size;
-
-    if (avctx->frame_size % s->block_size) {
-        av_log(avctx, AV_LOG_ERROR,
-               "Frame size must be a multiple of %d samples\n", s->block_size);
-        return AVERROR(EINVAL);
-    }
-
     for (chan = 0; chan < NB_CHANNELS; chan++) {
         Channel *channel = &s->channels[chan];
         for (subband = 0; subband < NB_SUBBANDS; subband++) {
@@ -534,6 +525,5 @@ av_cold int ff_aptx_init(AVCodecContext *avctx)
         }
     }
 
-    ff_af_queue_init(avctx, &s->afq);
     return 0;
 }