From 9d9e31722ad6dda86da0ccb7eb72004c99057274 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 22 Oct 2003 15:36:46 +0000 Subject: 112 bytes smaller MpegEncContext Originally committed as revision 2414 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.c | 4 ++++ libavcodec/mpegvideo.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 0af668d053..aaf6b870d6 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -447,6 +447,8 @@ int MPV_common_init(MpegEncContext *s) CHECKED_ALLOCZ(s->q_inter_matrix, 64*32 * sizeof(int)) CHECKED_ALLOCZ(s->q_intra_matrix16, 64*32*2 * sizeof(uint16_t)) CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t)) + CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) + CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) } CHECKED_ALLOCZ(s->blocks, 64*6*2 * sizeof(DCTELEM)) @@ -571,6 +573,8 @@ void MPV_common_end(MpegEncContext *s) av_freep(&s->q_intra_matrix16); av_freep(&s->q_inter_matrix16); av_freep(&s->blocks); + av_freep(&s->input_picture); + av_freep(&s->reordered_input_picture); for(i=0; ipicture[i]); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index af01cba210..40a3bdfc04 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -302,8 +302,8 @@ typedef struct MpegEncContext { 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; ///< 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 + Picture **input_picture; ///< next pictures on display order for encoding + Picture **reordered_input_picture; ///< pointer to the next pictures in codedorder for encoding /** * copy of the previous picture structure. -- cgit v1.2.3