RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
arpi 2002-03-06 20:56:06 +00:00
parent 28ff6d3ce6
commit 9ca9a4270c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmpcodecs/vd_cinepak.c
View File

@ -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]);

3
libmpcodecs/vd_qtrpza.c
View File

@ -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"