Prevent invalid timestamps from being stored.

[ffmpeg] / libavformat / utils.c

diff --git a/libavformat/utils.c b/libavformat/utils.c
index f098d051b4e224124e0258c173b84fe467e551d9..d2ed35d9380c0fd7a5985b9ff446913d9387da81 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1729,7 +1729,9 @@ static int has_codec_parameters(AVCodecContext *enc)
     switch(enc->codec_type) {
     case CODEC_TYPE_AUDIO:
         val = enc->sample_rate && enc->channels;
-        if(enc->codec_id == CODEC_ID_VORBIS && !enc->frame_size)
+        if(!enc->frame_size &&
+           (enc->codec_id == CODEC_ID_VORBIS ||
+            enc->codec_id == CODEC_ID_AAC))
             return 0;
         break;
     case CODEC_TYPE_VIDEO: