Avoid to break compatility when making the functions dealing with
pixel format names in imgconvert.c use the names defined in pixdescs.
Originally committed as revision 20624 to svn://svn.ffmpeg.org/ffmpeg/trunk
... | ... |
@@ -36,7 +36,7 @@ |
36 | 36 |
|
37 | 37 |
#define LIBAVUTIL_VERSION_MAJOR 50 |
38 | 38 |
#define LIBAVUTIL_VERSION_MINOR 5 |
39 |
-#define LIBAVUTIL_VERSION_MICRO 0 |
|
39 |
+#define LIBAVUTIL_VERSION_MICRO 1 |
|
40 | 40 |
|
41 | 41 |
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
42 | 42 |
LIBAVUTIL_VERSION_MINOR, \ |
... | ... |
@@ -112,7 +112,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { |
112 | 112 |
}, |
113 | 113 |
}, |
114 | 114 |
[PIX_FMT_GRAY8] = { |
115 |
- .name = "gray8", |
|
115 |
+ .name = "gray", |
|
116 | 116 |
.nb_components= 1, |
117 | 117 |
.log2_chroma_w= 0, |
118 | 118 |
.log2_chroma_h= 0, |
... | ... |
@@ -121,7 +121,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { |
121 | 121 |
}, |
122 | 122 |
}, |
123 | 123 |
[PIX_FMT_MONOWHITE] = { |
124 |
- .name = "monowhite", |
|
124 |
+ .name = "monow", |
|
125 | 125 |
.nb_components= 1, |
126 | 126 |
.log2_chroma_w= 0, |
127 | 127 |
.log2_chroma_h= 0, |
... | ... |
@@ -131,7 +131,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { |
131 | 131 |
.flags = PIX_FMT_BITSTREAM, |
132 | 132 |
}, |
133 | 133 |
[PIX_FMT_MONOBLACK] = { |
134 |
- .name = "monoblack", |
|
134 |
+ .name = "monob", |
|
135 | 135 |
.nb_components= 1, |
136 | 136 |
.log2_chroma_w= 0, |
137 | 137 |
.log2_chroma_h= 0, |
... | ... |
@@ -184,11 +184,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { |
184 | 184 |
}, |
185 | 185 |
}, |
186 | 186 |
[PIX_FMT_XVMC_MPEG2_MC] = { |
187 |
- .name = "xvmc_mpeg2_mc", |
|
187 |
+ .name = "xvmcmc", |
|
188 | 188 |
.flags = PIX_FMT_HWACCEL, |
189 | 189 |
}, |
190 | 190 |
[PIX_FMT_XVMC_MPEG2_IDCT] = { |
191 |
- .name = "xvmc_mpeg2_idct", |
|
191 |
+ .name = "xvmcidct", |
|
192 | 192 |
.flags = PIX_FMT_HWACCEL, |
193 | 193 |
}, |
194 | 194 |
[PIX_FMT_UYVY422] = { |