diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-12-10 22:39:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-03-25 22:30:37 +0300 |
| commit | 4f1e4eae993a22eff4561c7c05f723f6c9ff94b8 (patch) | |
| tree | 98ad365a282453b1929450d2d412ea6afa026316 /libmpcodecs | |
| parent | fd50478659e56db84e8564434702cdc8291ac854 (diff) | |
| download | mpv-4f1e4eae993a22eff4561c7c05f723f6c9ff94b8.tar.bz2 mpv-4f1e4eae993a22eff4561c7c05f723f6c9ff94b8.tar.xz | |
cosmetics: misc minor cleanups
The deleted ZRM* things were only relevant to vo_zr, which was deleted
earlier.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/img_format.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/img_format.h | 5 | ||||
| -rw-r--r-- | libmpcodecs/mp_image.c | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c index c4884f3eca..c6d3e82149 100644 --- a/libmpcodecs/img_format.c +++ b/libmpcodecs/img_format.c @@ -102,9 +102,6 @@ const char *vo_format_name(int format) case IMGFMT_YUVP: return "Packed YUVP"; case IMGFMT_UYVP: return "Packed UYVP"; case IMGFMT_MPEGPES: return "Mpeg PES"; - case IMGFMT_ZRMJPEGNI: return "Zoran MJPEG non-interlaced"; - case IMGFMT_ZRMJPEGIT: return "Zoran MJPEG top field first"; - case IMGFMT_ZRMJPEGIB: return "Zoran MJPEG bottom field first"; case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation"; case IMGFMT_XVMC_IDCT_MPEG2: return "MPEG1/2 Motion Compensation and IDCT"; case IMGFMT_VDPAU_MPEG1: return "MPEG1 VDPAU acceleration"; diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 3056e29268..d4443af2c9 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -190,11 +190,6 @@ /* Compressed Formats */ #define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S')) #define IMGFMT_MJPEG (('M')|('J'<<8)|('P'<<16)|('G'<<24)) -/* Formats that are understood by zoran chips, we include - * non-interlaced, interlaced top-first, interlaced bottom-first */ -#define IMGFMT_ZRMJPEGNI (('Z'<<24)|('R'<<16)|('N'<<8)|('I')) -#define IMGFMT_ZRMJPEGIT (('Z'<<24)|('R'<<16)|('I'<<8)|('T')) -#define IMGFMT_ZRMJPEGIB (('Z'<<24)|('R'<<16)|('I'<<8)|('B')) // I think that this code could not be used by any other codec/format #define IMGFMT_XVMC 0x1DC70000 diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 4683f41174..45426eb673 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -99,9 +99,7 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED); mpi->imgfmt=out_fmt; // compressed formats - if(out_fmt == IMGFMT_MPEGPES || - out_fmt == IMGFMT_ZRMJPEGNI || out_fmt == IMGFMT_ZRMJPEGIT || out_fmt == IMGFMT_ZRMJPEGIB || - IMGFMT_IS_HWACCEL(out_fmt)){ + if(out_fmt == IMGFMT_MPEGPES || IMGFMT_IS_HWACCEL(out_fmt)){ mpi->bpp=0; return; } |