RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cosmetics: reorder the pixel format descriptors to make them match the 

same order in pixfmt.h.

Originally committed as revision 18281 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2009-03-31 18:52:50 +00:00
parent 5e8b83ac3b
commit bcbd9a149e
1 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
libavcodec/pixdesc.c
View File

@ -23,22 +23,44 @@
#include "pixdesc.h"
const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
[PIX_FMT_YUV422P] = {
.name = "yuv422p",
[PIX_FMT_YUV420P] = {
.name = "yuv420p",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 0,
.log2_chroma_h= 1,
.comp = {
{0,0,1,0,7}, /* Y */
{1,0,1,0,7}, /* U */
{2,0,1,0,7}, /* V */
},
},
[PIX_FMT_YUV420P] = {
.name = "yuv420p",
[PIX_FMT_YUYV422] = {
.name = "yuyv422",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 1,
.log2_chroma_h= 0,
.comp = {
{0,1,1,0,7}, /* Y */
{0,3,2,0,7}, /* U */
{0,3,4,0,7}, /* V */
},
},
[PIX_FMT_RGB24] = {
.name = "rgb24",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,2,1,0,7}, /* R */
{0,2,2,0,7}, /* G */
{0,2,3,0,7}, /* B */
},
},
[PIX_FMT_YUV422P] = {
.name = "yuv422p",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 0,
.comp = {
{0,0,1,0,7}, /* Y */
{1,0,1,0,7}, /* U */
@ -56,127 +78,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
{2,0,1,0,7}, /* V */
},
},
[PIX_FMT_NV12] = {
.name = "nv12",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 1,
.comp = {
{0,0,1,0,7}, /* Y */
{1,1,1,0,7}, /* U */
{1,1,2,0,7}, /* V */
},
},
[PIX_FMT_YUYV422] = {
.name = "yuyv422",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 0,
.comp = {
{0,1,1,0,7}, /* Y */
{0,3,2,0,7}, /* U */
{0,3,4,0,7}, /* V */
},
},
[PIX_FMT_UYVY422] = {
.name = "uyvy422",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 0,
.comp = {
{0,1,2,0,7}, /* Y */
{0,3,1,0,7}, /* U */
{0,3,3,0,7}, /* V */
},
},
[PIX_FMT_GRAY16LE] = {
.name = "gray16le",
.nb_channels = 1,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,1,0,15}, /* Y */
},
},
[PIX_FMT_GRAY16BE] = {
.name = "gray16be",
.nb_channels = 1,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,1,0,15}, /* Y */
},
.flags = PIX_FMT_BE,
},
[PIX_FMT_RGB24] = {
.name = "rgb24",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,2,1,0,7}, /* R */
{0,2,2,0,7}, /* G */
{0,2,3,0,7}, /* B */
},
},
[PIX_FMT_RGBA] = {
.name = "rgba",
.nb_channels = 4,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,3,1,0,7}, /* R */
{0,3,2,0,7}, /* G */
{0,3,3,0,7}, /* B */
{0,3,4,0,7}, /* A */
},
},
[PIX_FMT_RGB48LE] = {
.name = "rgb48le",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,5,1,0,15}, /* R */
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */
},
},
[PIX_FMT_RGB48BE] = {
.name = "rgb48be",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,5,1,0,15}, /* R */
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */
},
.flags = PIX_FMT_BE,
},
[PIX_FMT_RGB565LE] = {
.name = "rgb565le",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,2,3,4}, /* R */
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* B */
},
},
[PIX_FMT_RGB565BE] = {
.name = "rgb565be",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,0,3,4}, /* R */
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* B */
},
.flags = PIX_FMT_BE,
},
[PIX_FMT_MONOBLACK] = {
.name = "monoblack",
.nb_channels = 1,
@ -197,4 +98,103 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
},
.flags = PIX_FMT_PAL,
},
[PIX_FMT_UYVY422] = {
.name = "uyvy422",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 0,
.comp = {
{0,1,2,0,7}, /* Y */
{0,3,1,0,7}, /* U */
{0,3,3,0,7}, /* V */
},
},
[PIX_FMT_NV12] = {
.name = "nv12",
.nb_channels = 3,
.log2_chroma_w= 1,
.log2_chroma_h= 1,
.comp = {
{0,0,1,0,7}, /* Y */
{1,1,1,0,7}, /* U */
{1,1,2,0,7}, /* V */
},
},
[PIX_FMT_RGBA] = {
.name = "rgba",
.nb_channels = 4,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,3,1,0,7}, /* R */
{0,3,2,0,7}, /* G */
{0,3,3,0,7}, /* B */
{0,3,4,0,7}, /* A */
},
},
[PIX_FMT_GRAY16BE] = {
.name = "gray16be",
.nb_channels = 1,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,1,0,15}, /* Y */
},
.flags = PIX_FMT_BE,
},
[PIX_FMT_GRAY16LE] = {
.name = "gray16le",
.nb_channels = 1,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,1,0,15}, /* Y */
},
},
[PIX_FMT_RGB48BE] = {
.name = "rgb48be",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,5,1,0,15}, /* R */
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */
},
.flags = PIX_FMT_BE,
},
[PIX_FMT_RGB48LE] = {
.name = "rgb48le",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,5,1,0,15}, /* R */
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */
},
},
[PIX_FMT_RGB565BE] = {
.name = "rgb565be",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,0,3,4}, /* R */
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* B */
},
.flags = PIX_FMT_BE,
},
[PIX_FMT_RGB565LE] = {
.name = "rgb565le",
.nb_channels = 3,
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
{0,1,2,3,4}, /* R */
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* B */
},
},
};