diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 502da0f0c5452669602da4a7c1b5444031f95f1e..e1dd43f7163f94624b3b2100f5e5c22651111c1c 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -493,10 +493,13 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
                 return ret;
     } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 &&
                (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {
+        if (!s->streams[pkt->stream_index]->nb_frames) {
         av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: "
                "use audio bitstream filter 'aac_adtstoasc' to fix it "
                "('-bsf:a aac_adtstoasc' option with ffmpeg)\n");
         return AVERROR_INVALIDDATA;
+        }
+        av_log(s, AV_LOG_WARNING, "aac bitstream error\n");
     }
 
     if (flv->delay == AV_NOPTS_VALUE)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 42496b57e95c8edf1d6d5c2a3fba731d4c2c8d2b..47dde94fd2cf84fa1d8539109cb6609f215118c5 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3185,8 +3185,11 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
         }
     } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 &&
                (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {
+        if (!s->streams[pkt->stream_index]->nb_frames) {
         av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n");
         return -1;
+        }
+        av_log(s, AV_LOG_WARNING, "aac bitstream error\n");
     } else {
         avio_write(pb, pkt->data, size);
     }