use av_fifo_generic_write, old func is deprecated

Originally committed as revision 13511 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 17 years ago
parent 659094cb6b
commit 57783b07a0
  1. 2
      libavformat/dvenc.c
  2. 2
      libavformat/mpegenc.c

@ -253,7 +253,7 @@ int dv_assemble_frame(DVMuxContext *c, AVStream* st,
/* FIXME: we have to have more sensible approach than this one */ /* 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) 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_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 */ /* Lets see if we've got enough audio for one DV frame */
c->has_audio |= ((reqasize <= av_fifo_size(&c->audio_data[i])) << i); c->has_audio |= ((reqasize <= av_fifo_size(&c->audio_data[i])) << i);

@ -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(;;){ for(;;){
int ret= output_packet(ctx, 0); int ret= output_packet(ctx, 0);

Loading…
Cancel
Save