aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-28 22:00:45 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-28 22:00:45 +0000
commit57783b07a0000aaa7509eafa72664cec54750b71 (patch)
tree6ba1be8b395831fd7f71f2681faaa7be3e4f805b
parent659094cb6b1207810d70049f4abaa4b4b8ff4cc0 (diff)
downloadffmpeg-57783b07a0000aaa7509eafa72664cec54750b71.tar.gz
use av_fifo_generic_write, old func is deprecated
Originally committed as revision 13511 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/dvenc.c2
-rw-r--r--libavformat/mpegenc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index af6856f44a..0b27295fd7 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -253,7 +253,7 @@ int dv_assemble_frame(DVMuxContext *c, AVStream* st,
/* 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);
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index f86143a5d2..09561a9ce8 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1180,7 +1180,7 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
}
}
- av_fifo_write(&stream->fifo, buf, size);
+ av_fifo_generic_write(&stream->fifo, buf, size, NULL);
for(;;){
int ret= output_packet(ctx, 0);