generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

112 bytes smaller MpegEncContext

Browse Source 
Originally committed as revision 2414 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-10-22 15:36:46 +00:00
parent 45686da26d
commit 9d9e31722a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo.c
View File

@ -447,6 +447,8 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->q_inter_matrix, 64*32 * sizeof(int)) 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_intra_matrix16, 64*32*2 * sizeof(uint16_t))
CHECKED_ALLOCZ(s->q_inter_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)) 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_intra_matrix16);
av_freep(&s->q_inter_matrix16); av_freep(&s->q_inter_matrix16);
av_freep(&s->blocks); av_freep(&s->blocks);
av_freep(&s->input_picture);
av_freep(&s->reordered_input_picture);
for(i=0; i<MAX_PICTURE_COUNT; i++){ for(i=0; i<MAX_PICTURE_COUNT; i++){
free_picture(s, &s->picture[i]); free_picture(s, &s->picture[i]);

4
libavcodec/mpegvideo.h
View File

@ -302,8 +302,8 @@ typedef struct MpegEncContext {
int linesize; ///< line size, in bytes, may be different from width int linesize; ///< line size, in bytes, may be different from width
int uvlinesize; ///< line size, for chroma 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 *picture; ///< main picture buffer
Picture *input_picture[MAX_PICTURE_COUNT]; ///< next pictures on display order for encoding Picture **input_picture; ///< next pictures on display order for encoding
Picture *reordered_input_picture[MAX_PICTURE_COUNT]; ///< pointer to the next pictures in codedorder for encoding Picture **reordered_input_picture; ///< pointer to the next pictures in codedorder for encoding
/** /**
* copy of the previous picture structure. * copy of the previous picture structure.