diff options
| author |  arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-06 20:56:06 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-06 20:56:06 +0000 |
| commit | 9ca9a4270ce368fe0f95de2f6c259101286213e0 (patch) | |
| tree | c325a355df94a33c0283490d90a3ba9e47157f0d /libmpcodecs | |
| parent | 28ff6d3ce63a78eea74e87f4ec1e195083d3a152 (diff) | |
order of #includes changed - shouldn't include local things before config.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4955 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_cinepak.c | 14 | ||||
| -rw-r--r-- | libmpcodecs/vd_qtrpza.c | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libmpcodecs/vd_cinepak.c b/libmpcodecs/vd_cinepak.c index b2ce011eff..9f5def9de0 100644 --- a/libmpcodecs/vd_cinepak.c +++ b/libmpcodecs/vd_cinepak.c @@ -1,11 +1,10 @@ #include <stdio.h> #include <stdlib.h> -#include "codec-cfg.h" - #include "config.h" #include "mp_msg.h" +#include "codec-cfg.h" #include "../libvo/img_format.h" #include "stream.h" @@ -55,13 +54,22 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ mp_image_t* mpi; if(len<=0) return NULL; // skipped frame - mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE | MP_IMGFLAG_ACCEPT_STRIDE, sh->disp_w, sh->disp_h); + mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE | MP_IMGFLAG_ACCEPT_STRIDE, + (sh->disp_w+3)&(~3), + (sh->disp_h+3)&(~3)); if(!mpi){ // temporary! printf("couldn't allocate image for cinepak codec\n"); return NULL; } + printf("mpi: %p/%d %p/%d %p/%d (%d) (%d) \n", + mpi->planes[0], mpi->stride[0], + mpi->planes[1], mpi->stride[1], + mpi->planes[2], mpi->stride[2], + mpi->planes[1]-mpi->planes[0], + mpi->planes[2]-mpi->planes[1]); + // decode_cinepak(sh->context, data, len, mpi->planes[0], sh->disp_w, sh->disp_h, // (mpi->flags&MP_IMGFLAG_YUV)?16:(mpi->imgfmt&255), mpi->stride[0]); diff --git a/libmpcodecs/vd_qtrpza.c b/libmpcodecs/vd_qtrpza.c index 0443e6b1d2..b3ae283237 100644 --- a/libmpcodecs/vd_qtrpza.c +++ b/libmpcodecs/vd_qtrpza.c @@ -1,11 +1,10 @@ #include <stdio.h> #include <stdlib.h> -#include "codec-cfg.h" - #include "config.h" #include "mp_msg.h" +#include "codec-cfg.h" #include "../libvo/img_format.h" #include "stream.h" |