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

dynamic alloc of picture structs instead of putting them in MpegEncContext

Browse Source 
Originally committed as revision 2410 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-10-21 19:55:31 +00:00
parent 7f96ed5b16
commit b465449eb7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.c
View File

@ -444,6 +444,8 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int)) 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)) CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t))
if (s->out_format == FMT_H263 || s->encoding) { 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++){ for(i=0; i<MAX_PICTURE_COUNT; i++){
free_picture(s, &s->picture[i]); free_picture(s, &s->picture[i]);
} }
av_freep(&s->picture);
avcodec_default_free_buffers(s->avctx); avcodec_default_free_buffers(s->avctx);
s->context_initialized = 0; s->context_initialized = 0;
s->last_picture_ptr= s->last_picture_ptr=

2
libavcodec/mpegvideo.h
View File

@ -301,7 +301,7 @@ typedef struct MpegEncContext {
int mb_num; ///< number of MBs of a picture int mb_num; ///< number of MBs of a picture
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[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 *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 *reordered_input_picture[MAX_PICTURE_COUNT]; ///< pointer to the next pictures in codedorder for encoding