[FFmpeg-cvslog] r17873 - in trunk: ffmpeg.c libavformat/audiointerleave.c libavutil/fifo.c

[reimar]

Author: reimar
Date: Sun Mar  8 15:42:11 2009
New Revision: 17873

Log:
Replace all uses of the replaced av_fifo_read by av_fifo_generic_read

Modified:
   trunk/ffmpeg.c
   trunk/libavformat/audiointerleave.c
   trunk/libavutil/fifo.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Mar  8 15:35:13 2009	(r17872)
+++ trunk/ffmpeg.c	Sun Mar  8 15:42:11 2009	(r17873)
@@ -672,7 +672,7 @@ static void do_audio_out(AVFormatContext
             AVPacket pkt;
             av_init_packet(&pkt);
 
-            av_fifo_read(ost->fifo, audio_buf, frame_bytes);
+            av_fifo_generic_read(ost->fifo, frame_bytes, NULL, audio_buf);
 
             //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio()
 
@@ -1452,7 +1452,7 @@ static int output_packet(AVInputStream *
                             if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
                                 int fs_tmp = enc->frame_size;
                                 enc->frame_size = fifo_bytes / (2 * enc->channels);
-                                av_fifo_read(ost->fifo, (uint8_t *)samples, fifo_bytes);
+                                av_fifo_generic_read(ost->fifo, fifo_bytes, NULL, samples);
                                     ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
                                 enc->frame_size = fs_tmp;
                             }

Modified: trunk/libavformat/audiointerleave.c
==============================================================================
--- trunk/libavformat/audiointerleave.c	Sun Mar  8 15:35:13 2009	(r17872)
+++ trunk/libavformat/audiointerleave.c	Sun Mar  8 15:42:11 2009	(r17873)
@@ -80,7 +80,7 @@ static int ff_interleave_new_audio_packe
         return 0;
 
     av_new_packet(pkt, size);
-    av_fifo_read(aic->fifo, pkt->data, size);
+    av_fifo_generic_read(aic->fifo, size, NULL, pkt->data);
 
     pkt->dts = pkt->pts = aic->dts;
     pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base);

Modified: trunk/libavutil/fifo.c
==============================================================================
--- trunk/libavutil/fifo.c	Sun Mar  8 15:35:13 2009	(r17872)
+++ trunk/libavutil/fifo.c	Sun Mar  8 15:42:11 2009	(r17873)
@@ -63,7 +63,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, un
 
         if (!f2)
             return -1;
-        av_fifo_read(f, f2->buffer, len);
+        av_fifo_generic_read(f, len, NULL, f2->buffer);
         f2->wptr += len;
         f2->wndx += len;
         av_free(f->buffer);