[FFmpeg-cvslog] r14848 - in trunk: ffmpeg.c libavformat/mpegenc.c

[stefano]

Author: stefano
Date: Tue Aug 19 20:49:57 2008
New Revision: 14848

Log:
Replace invocations of av_fifo_realloc(), which is going to be
deprecated, with corresponding invocations of av_fifo_realloc2().


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

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Tue Aug 19 20:49:57 2008
@@ -644,7 +644,10 @@ static void do_audio_out(AVFormatContext
     /* now encode as many frames as possible */
     if (enc->frame_size > 1) {
         /* output resampled raw samples */
-        av_fifo_realloc(&ost->fifo, av_fifo_size(&ost->fifo) + size_out);
+        if (av_fifo_realloc2(&ost->fifo, av_fifo_size(&ost->fifo) + size_out) < 0) {
+            fprintf(stderr, "av_fifo_realloc2() failed\n");
+            av_exit(1);
+        }
         av_fifo_generic_write(&ost->fifo, buftmp, size_out, NULL);
 
         frame_bytes = enc->frame_size * 2 * enc->channels;

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Tue Aug 19 20:49:57 2008
@@ -1170,7 +1170,8 @@ static int mpeg_mux_write_packet(AVForma
         stream->predecode_packet= pkt_desc;
     stream->next_packet= &pkt_desc->next;
 
-    av_fifo_realloc(&stream->fifo, av_fifo_size(&stream->fifo) + size);
+    if (av_fifo_realloc2(&stream->fifo, av_fifo_size(&stream->fifo) + size) < 0)
+        return -1;
 
     if (s->is_dvd){
         if (is_iframe && (s->packet_number == 0 || (pts - stream->vobu_start_pts >= 36000))) { // min VOBU length 0.4 seconds (mpucoder)