matroskadec: move ARRAY_SIZE() macro at top of the file

[ffmpeg] / libavformat / gxfenc.c

diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index 469105de5f5f00184c8dc430530c459b3da76e54..588a223f00da81a7e5b54651d809a2fa76794c71 100644 (file)
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/fifo.h"
 #include "avformat.h"
 #include "gxf.h"
 #include "riff.h"
-#include "fifo.h"
 
 #define GXF_AUDIO_PACKET_SIZE 65536
 
@@ -793,7 +793,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
         GXFStreamContext *sc = &gxf->streams[i];
         if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
             if (pkt && pkt->stream_index == i) {
-                av_fifo_write(&sc->audio_buffer, pkt->data, pkt->size);
+                av_fifo_generic_write(&sc->audio_buffer, pkt->data, pkt->size, NULL);
                 pkt = NULL;
             }
             if (flush || av_fifo_size(&sc->audio_buffer) >= GXF_AUDIO_PACKET_SIZE) {