Mercurial > libavcodec.hg

diff mpeg12.c @ 9721:5d0f71ba8648 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 017967b3067f
children efd0c5014ac7
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;
                     }
                 }