diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
| commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
| tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /libmpcodecs/img_format.h | |
| parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
| parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
| download | mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2 mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'libmpcodecs/img_format.h')
| -rw-r--r-- | libmpcodecs/img_format.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index a3a475a68b..4200282f98 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -192,11 +192,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 |