nutenc: do not use AVCodecContext.frame_size
authorAnton Khirnov <anton@khirnov.net>
Sun, 21 Feb 2016 09:55:18 +0000 (10:55 +0100)
committerAnton Khirnov <anton@khirnov.net>
Mon, 22 Feb 2016 10:28:00 +0000 (11:28 +0100)
It will in general not be available. Use block_align if known or fall
back to av_get_audio_frame_duration().

libavformat/nutenc.c

index be6579d..7b69ff3 100644 (file)
@@ -190,9 +190,16 @@ static void build_frame_code(AVFormatContext *s)
 
         key_frame = intra_only;
         if (is_audio) {
-            int frame_bytes = codec->frame_size * (int64_t)codec->bit_rate /
-                              (8 * codec->sample_rate);
+            int frame_bytes;
             int pts;
+
+            if (codec->block_align > 0) {
+                frame_bytes = codec->block_align;
+            } else {
+                int frame_size = av_get_audio_frame_duration(codec, 0);
+                frame_bytes = frame_size * (int64_t)codec->bit_rate / (8 * codec->sample_rate);
+            }
+
             for (pts = 0; pts < 2; pts++)
                 for (pred = 0; pred < 2; pred++) {
                     FrameCode *ft = &nut->frame_code[start2];