Move AVStream->codec_info_nb_frames increment after try_decode_frame

[ffmpeg] / libavformat / audiointerleave.h

diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h
index 45ba9e27fdb6e8135888b7ac34b9f927557ca77e..c948c366fbf70662502a7988cae6b2cdb0979301 100644 (file)
--- a/libavformat/audiointerleave.h
+++ b/libavformat/audiointerleave.h
@@ -27,7 +27,7 @@
 #include "avformat.h"
 
 typedef struct {
-    AVFifoBuffer fifo;
+    AVFifoBuffer *fifo;
     unsigned fifo_size;           ///< size of currently allocated FIFO
     uint64_t dts;                 ///< current dts
     int sample_size;              ///< size of one sample all channels included
@@ -49,7 +49,7 @@ int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt)
  * @param get_packet function will output a packet when streams are correctly interleaved.
  * @param compare_ts function will compare AVPackets and decide interleaving order.
  */
-int ff_audio_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
+int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
                         int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int),
                         int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *));