[SCM] libav/experimental: Only allocate stats_out when needed in ffv1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:18:10 UTC 2013
The following commit has been merged in the experimental branch:
commit c42c1007c7b65c0b188467e2d349e3af543eb4c2
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Oct 26 23:01:00 2010 +0000
Only allocate stats_out when needed in ffv1
Originally committed as revision 25579 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index e9d6796..4e2dceb 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -945,6 +945,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return -1;
#define STATS_OUT_SIZE 1024*30
+ if(avctx->flags & CODEC_FLAG_PASS1)
avctx->stats_out= av_mallocz(STATS_OUT_SIZE);
return 0;
@@ -1099,7 +1100,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
p+= strlen(p);
}
snprintf(p, end-p, "\n");
- } else
+ } else if(avctx->flags&CODEC_FLAG_PASS1)
avctx->stats_out[0] = '\0';
f->picture_number++;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list