[FFmpeg-cvslog] r13455 - in trunk: ffmpeg.c libavformat/gxfenc.c

[bcoudurier]

Author: bcoudurier
Date: Tue May 27 03:26:22 2008
New Revision: 13455

Log:
use av_fifo_generic_write, old func is deprecated

Modified:
   trunk/ffmpeg.c
   trunk/libavformat/gxfenc.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Tue May 27 03:26:22 2008
@@ -588,7 +588,7 @@ static void do_audio_out(AVFormatContext
     if (enc->frame_size > 1) {
         /* output resampled raw samples */
         av_fifo_realloc(&ost->fifo, av_fifo_size(&ost->fifo) + size_out);
-        av_fifo_write(&ost->fifo, buftmp, size_out);
+        av_fifo_generic_write(&ost->fifo, buftmp, size_out, NULL);
 
         frame_bytes = enc->frame_size * 2 * enc->channels;
 

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	(original)
+++ trunk/libavformat/gxfenc.c	Tue May 27 03:26:22 2008
@@ -793,7 +793,7 @@ static int gxf_interleave_packet(AVForma
         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) {