virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Make av_pix_fmt_descriptors use the same pixel format names as defined

Browse Source 
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.

Originally committed as revision 20624 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2009-11-26 20:58:37 +00:00
parent 0bf095a837
commit 382cb1154c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/avutil.h
View File

@ -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, \

10
libavutil/pixdesc.c
View File

@ -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] = {
}, },
}, },
[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] = {
.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] = {
}, },
}, },
[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] = {