diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-10-22 15:36:46 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-10-22 15:36:46 +0000 |
| commit | 9d9e31722ad6dda86da0ccb7eb72004c99057274 (patch) | |
| tree | 7d399fb3166011b1e0ee66eb172ae9e5cf9584ed | |
| parent | 45686da26db54f1ca7195b360230574f7be3b2f3 (diff) | |
| download | ffmpeg-9d9e31722ad6dda86da0ccb7eb72004c99057274.tar.gz | |
112 bytes smaller MpegEncContext
Originally committed as revision 2414 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 |
2 files changed, 6 insertions, 2 deletions
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; i<MAX_PICTURE_COUNT; i++){ free_picture(s, &s->picture[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. |