diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-27 19:55:35 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-27 19:55:35 +0000 |
| commit | a4a750d3b2fbac34cbe3968db0988eb3af911f8f (patch) | |
| tree | 1281abb219aa3a5e618d94dbe9b50184d5bd52a9 /libavcodec/mpegvideo.c | |
| parent | 50352827f6444cf74fe37de9827c3ebb9a55fbcb (diff) | |
| download | ffmpeg-a4a750d3b2fbac34cbe3968db0988eb3af911f8f.tar.gz | |
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.
Originally committed as revision 18968 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index da157c733b..7af9507fce 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -219,7 +219,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) * 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 @@ alloc: 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; |