@@ -520,13 +520,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,

     int chan_el_counter[4];

     FFPsyWindowInfo windows[AAC_MAX_CHANNELS];

-    if (s->last_frame == 2)

-        return 0;

-

     /* add current frame to queue */

     if (frame) {

         if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)

             return ret;

+    } else {

+        if (!s->afq.remaining_samples || (!s->afq.frame_alloc && !s->afq.frame_count))

+            return 0;

     }

     copy_input_samples(s, frame);

@@ -841,9 +841,6 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,

     s->lambda_sum += s->lambda;

     s->lambda_count++;

-    if (!frame)

-        s->last_frame++;

-

     ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts,

                        &avpkt->duration);

@@ -112,7 +112,6 @@ typedef struct AACEncContext {

     struct FFPsyPreprocessContext* psypp;

     AACCoefficientsEncoder *coder;

     int cur_channel;                             ///< current channel for coder context

-    int last_frame;

     int random_state;

     float lambda;

     int last_frame_pb_count;                     ///< number of bits for the previous frame