[FFmpeg-cvslog] r13511 - in trunk/libavformat: dvenc.c mpegenc.c

bcoudurier subversion
Thu May 29 00:00:45 CEST 2008


Author: bcoudurier
Date: Thu May 29 00:00:45 2008
New Revision: 13511

Log:
use av_fifo_generic_write, old func is deprecated

Modified:
   trunk/libavformat/dvenc.c
   trunk/libavformat/mpegenc.c

Modified: trunk/libavformat/dvenc.c
==============================================================================
--- trunk/libavformat/dvenc.c	(original)
+++ trunk/libavformat/dvenc.c	Thu May 29 00:00:45 2008
@@ -253,7 +253,7 @@ int dv_assemble_frame(DVMuxContext *c, A
           /* FIXME: we have to have more sensible approach than this one */
         if (av_fifo_size(&c->audio_data[i]) + data_size >= 100*AVCODEC_MAX_AUDIO_FRAME_SIZE)
             av_log(st->codec, AV_LOG_ERROR, "Can't process DV frame #%d. Insufficient video data or severe sync problem.\n", c->frames);
-        av_fifo_write(&c->audio_data[i], data, data_size);
+        av_fifo_generic_write(&c->audio_data[i], data, data_size, NULL);
 
         /* Lets see if we've got enough audio for one DV frame */
         c->has_audio |= ((reqasize <= av_fifo_size(&c->audio_data[i])) << i);

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Thu May 29 00:00:45 2008
@@ -1180,7 +1180,7 @@ static int mpeg_mux_write_packet(AVForma
         }
     }
 
-    av_fifo_write(&stream->fifo, buf, size);
+    av_fifo_generic_write(&stream->fifo, buf, size, NULL);
 
     for(;;){
         int ret= output_packet(ctx, 0);




More information about the ffmpeg-cvslog mailing list