Mercurial > libavcodec.hg
comparison raw.c @ 11697:79a98585aa2d libavcodec
Reorder nut specific codec tags and add a comment for marking them as
such.
Also put the [3][0][0][0] codec tag, mapped to rgb565le, in a special
section. It needs to be specified *after* the nut RGB[16] codec tag,
otherwise it will be used by default when encoding normal non-flipped
rgb565le, and will be decoded like a flipped format (see
rawdec.c:raw_init_decoder()).
author | stefano |
---|---|
date | Sun, 09 May 2010 23:04:06 +0000 |
parents | 9519a0e8cec6 |
children | 98492069d859 |
comparison
equal
deleted
inserted
replaced
11696:9519a0e8cec6 | 11697:79a98585aa2d |
---|---|
62 { PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */ | 62 { PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */ |
63 { PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') }, | 63 { PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') }, |
64 { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ | 64 { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ |
65 { PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') }, | 65 { PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') }, |
66 { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, | 66 { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, |
67 | |
68 /* nut */ | |
67 { PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) }, | 69 { PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) }, |
68 { PIX_FMT_BGR555LE, MKTAG('B', 'G', 'R', 15) }, | 70 { PIX_FMT_BGR555LE, MKTAG('B', 'G', 'R', 15) }, |
69 { PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) }, | 71 { PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) }, |
70 { PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) }, | 72 { PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) }, |
71 { PIX_FMT_RGB565LE, MKTAG( 3 , 0 , 0 , 0) }, | |
72 { PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') }, | 73 { PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') }, |
73 { PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') }, | 74 { PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') }, |
74 { PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') }, | 75 { PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') }, |
75 { PIX_FMT_BGR565BE, MKTAG(16 , 'R', 'G', 'B') }, | 76 { PIX_FMT_BGR565BE, MKTAG(16 , 'R', 'G', 'B') }, |
76 { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') }, | 77 { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') }, |
86 { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ | 87 { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ |
87 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, | 88 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, |
88 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, | 89 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, |
89 { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, | 90 { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, |
90 | 91 |
92 /* special */ | |
93 { PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */ | |
94 | |
91 { PIX_FMT_NONE, 0 }, | 95 { PIX_FMT_NONE, 0 }, |
92 }; | 96 }; |
93 | 97 |
94 unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) | 98 unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) |
95 { | 99 { |