flvenc: only write the framerate tag based on avg_frame_rate

[ffmpeg] / libavformat / audiointerleave.c

diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index e48f826e1466eaf163b2986e7d2e855cb86ade20..e4cde9d0aab619a2db1aa6fe12e53fc0194c0bde 100644 (file)
--- a/libavformat/audiointerleave.c
+++ b/libavformat/audiointerleave.c
@@ -70,8 +70,8 @@ int ff_audio_interleave_init(AVFormatContext *s,
     return 0;
 }
 
-static int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
-                                   int stream_index, int flush)
+static int interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
+                                       int stream_index, int flush)
 {
     AVStream *st = s->streams[stream_index];
     AudioInterleaveContext *aic = st->priv_data;
@@ -125,10 +125,10 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt
         AVStream *st = s->streams[i];
         if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
             AVPacket new_pkt;
-            while (ff_interleave_new_audio_packet(s, &new_pkt, i, flush))
+            while (interleave_new_audio_packet(s, &new_pkt, i, flush))
                 ff_interleave_add_packet(s, &new_pkt, compare_ts);
         }
     }
 
-    return get_packet(s, out, pkt, flush);
+    return get_packet(s, out, NULL, flush);
 }