From b465449eb7acaa06034bca4cc494440f7ea93ef6 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 21 Oct 2003 19:55:31 +0000
Subject: [PATCH] dynamic alloc of picture structs instead of putting them in
MpegEncContext
Originally committed as revision 2410 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mpegvideo.c | 3 +++
libavcodec/mpegvideo.h | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 2f60055721a..a4d29ba9009 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -444,6 +444,8 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int))
}
+ CHECKED_ALLOCZ(s->picture, MAX_PICTURE_COUNT * sizeof(Picture))
+
CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t))
if (s->out_format == FMT_H263 || s->encoding) {
@@ -562,6 +564,7 @@ void MPV_common_end(MpegEncContext *s)
for(i=0; i<MAX_PICTURE_COUNT; i++){
free_picture(s, &s->picture[i]);
}
+ av_freep(&s->picture);
avcodec_default_free_buffers(s->avctx);
s->context_initialized = 0;
s->last_picture_ptr=
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 30432c17315..e557a81d1e6 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -301,7 +301,7 @@ typedef struct MpegEncContext {
int mb_num; ///< number of MBs of a picture
int linesize; ///< line size, in bytes, may be different from width
int uvlinesize; ///< line size, for chroma in bytes, may be different from width
- Picture picture[MAX_PICTURE_COUNT]; ///< main picture buffer
+ Picture *picture; ///< main picture buffer
Picture *input_picture[MAX_PICTURE_COUNT]; ///< next pictures on display order for encoding
Picture *reordered_input_picture[MAX_PICTURE_COUNT]; ///< pointer to the next pictures in codedorder for encoding
--
GitLab