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/mpeg12.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/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 48c7899f7c..477e99c444 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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 @@ static int decode_chunks(AVCodecContext *avctx, /* 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; } } |