Commit 0e70cb7e authored by stefano's avatar stefano

Make av_pix_fmt_descriptors use the same pixel format names as defined

in libavcodec/imgconvert.c.

Avoid to break compatility when making the functions dealing with
pixel format names in imgconvert.c use the names defined in pixdescs.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20624 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a28b37e1
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define LIBAVUTIL_VERSION_MAJOR 50 #define LIBAVUTIL_VERSION_MAJOR 50
#define LIBAVUTIL_VERSION_MINOR 5 #define LIBAVUTIL_VERSION_MINOR 5
#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_MICRO 1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \
......
...@@ -112,7 +112,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -112,7 +112,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
}, },
[PIX_FMT_GRAY8] = { [PIX_FMT_GRAY8] = {
.name = "gray8", .name = "gray",
.nb_components= 1, .nb_components= 1,
.log2_chroma_w= 0, .log2_chroma_w= 0,
.log2_chroma_h= 0, .log2_chroma_h= 0,
...@@ -121,7 +121,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -121,7 +121,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
}, },
[PIX_FMT_MONOWHITE] = { [PIX_FMT_MONOWHITE] = {
.name = "monowhite", .name = "monow",
.nb_components= 1, .nb_components= 1,
.log2_chroma_w= 0, .log2_chroma_w= 0,
.log2_chroma_h= 0, .log2_chroma_h= 0,
...@@ -131,7 +131,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -131,7 +131,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
.flags = PIX_FMT_BITSTREAM, .flags = PIX_FMT_BITSTREAM,
}, },
[PIX_FMT_MONOBLACK] = { [PIX_FMT_MONOBLACK] = {
.name = "monoblack", .name = "monob",
.nb_components= 1, .nb_components= 1,
.log2_chroma_w= 0, .log2_chroma_w= 0,
.log2_chroma_h= 0, .log2_chroma_h= 0,
...@@ -184,11 +184,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -184,11 +184,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
}, },
[PIX_FMT_XVMC_MPEG2_MC] = { [PIX_FMT_XVMC_MPEG2_MC] = {
.name = "xvmc_mpeg2_mc", .name = "xvmcmc",
.flags = PIX_FMT_HWACCEL, .flags = PIX_FMT_HWACCEL,
}, },
[PIX_FMT_XVMC_MPEG2_IDCT] = { [PIX_FMT_XVMC_MPEG2_IDCT] = {
.name = "xvmc_mpeg2_idct", .name = "xvmcidct",
.flags = PIX_FMT_HWACCEL, .flags = PIX_FMT_HWACCEL,
}, },
[PIX_FMT_UYVY422] = { [PIX_FMT_UYVY422] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment