Mercurial > libavcodec.hg
changeset 9721:5d0f71ba8648 libavcodec
Rename alloc_picture to ff_alloc_picture and move its definition
in mpegvideo.h to avoid including mpegvideo_common.h in mpeg12.c,
because it contains motion code.
| author | bcoudurier |
|---|---|
| date | Wed, 27 May 2009 19:55:35 +0000 |
| parents | d6a35d7be925 |
| children | 0bfb23c7633d |
| files | mpeg12.c mpegvideo.c mpegvideo.h mpegvideo_enc.c |
| diffstat | 4 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mpeg12.c Wed May 27 18:59:24 2009 +0000 +++ b/mpeg12.c Wed May 27 19:55:35 2009 +0000 @@ -30,7 +30,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "mpegvideo_common.h" #include "mpeg12.h" #include "mpeg12data.h" @@ -2373,7 +2372,7 @@ /* Allocate a dummy frame */ i= ff_find_unused_picture(s2, 0); s2->last_picture_ptr= &s2->picture[i]; - if(alloc_picture(s2, s2->last_picture_ptr, 0) < 0) + if(ff_alloc_picture(s2, s2->last_picture_ptr, 0) < 0) return -1; } }
--- a/mpegvideo.c Wed May 27 18:59:24 2009 +0000 +++ b/mpegvideo.c Wed May 27 19:55:35 2009 +0000 @@ -219,7 +219,7 @@ * allocates a Picture * The pixels are allocated/set by calling get_buffer() if shared=0 */ -int alloc_picture(MpegEncContext *s, Picture *pic, int shared){ +int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared){ const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) does not sig11 const int mb_array_size= s->mb_stride*s->mb_height; const int b8_array_size= s->b8_stride*s->mb_height*2; @@ -917,7 +917,7 @@ pic->coded_picture_number= s->coded_picture_number++; - if(alloc_picture(s, pic, 0) < 0) + if(ff_alloc_picture(s, pic, 0) < 0) return -1; s->current_picture_ptr= pic;
--- a/mpegvideo.h Wed May 27 18:59:24 2009 +0000 +++ b/mpegvideo.h Wed May 27 19:55:35 2009 +0000 @@ -711,6 +711,12 @@ void ff_init_block_index(MpegEncContext *s); void ff_copy_picture(Picture *dst, Picture *src); +/** + * allocates a Picture + * The pixels are allocated/set by calling get_buffer() if shared=0 + */ +int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); + extern const enum PixelFormat ff_pixfmt_list_420[]; extern const enum PixelFormat ff_hwaccel_pixfmt_list_420[];
--- a/mpegvideo_enc.c Wed May 27 18:59:24 2009 +0000 +++ b/mpegvideo_enc.c Wed May 27 19:55:35 2009 +0000 @@ -817,14 +817,14 @@ pic->data[i]= pic_arg->data[i]; pic->linesize[i]= pic_arg->linesize[i]; } - alloc_picture(s, (Picture*)pic, 1); + ff_alloc_picture(s, (Picture*)pic, 1); }else{ i= ff_find_unused_picture(s, 0); pic= (AVFrame*)&s->picture[i]; pic->reference= 3; - alloc_picture(s, (Picture*)pic, 0); + ff_alloc_picture(s, (Picture*)pic, 0); if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] && pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] @@ -1150,7 +1150,7 @@ Picture *pic= &s->picture[i]; pic->reference = s->reordered_input_picture[0]->reference; - alloc_picture(s, pic, 0); + ff_alloc_picture(s, pic, 0); /* mark us unused / free shared pic */ if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_INTERNAL)