diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-11-26 20:58:37 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-11-26 20:58:37 +0000 |
| commit | 382cb1154c0f7f5a55e715c154af876364e7205f (patch) | |
| tree | 07d92bb77409605b6a42e50103501c37bcd09d49 | |
| parent | 0bf095a8372427e603af7853c45b29547ced8653 (diff) | |
| download | ffmpeg-382cb1154c0f7f5a55e715c154af876364e7205f.tar.gz | |
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.
Originally committed as revision 20624 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/pixdesc.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index a510d53e8a..d799211ffc 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -36,7 +36,7 @@ #define LIBAVUTIL_VERSION_MAJOR 50 #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, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index ad4efb2517..b689519fde 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -112,7 +112,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { }, }, [PIX_FMT_GRAY8] = { - .name = "gray8", + .name = "gray", .nb_components= 1, .log2_chroma_w= 0, .log2_chroma_h= 0, @@ -121,7 +121,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { }, }, [PIX_FMT_MONOWHITE] = { - .name = "monowhite", + .name = "monow", .nb_components= 1, .log2_chroma_w= 0, .log2_chroma_h= 0, @@ -131,7 +131,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { .flags = PIX_FMT_BITSTREAM, }, [PIX_FMT_MONOBLACK] = { - .name = "monoblack", + .name = "monob", .nb_components= 1, .log2_chroma_w= 0, .log2_chroma_h= 0, @@ -184,11 +184,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { }, }, [PIX_FMT_XVMC_MPEG2_MC] = { - .name = "xvmc_mpeg2_mc", + .name = "xvmcmc", .flags = PIX_FMT_HWACCEL, }, [PIX_FMT_XVMC_MPEG2_IDCT] = { - .name = "xvmc_mpeg2_idct", + .name = "xvmcidct", .flags = PIX_FMT_HWACCEL, }, [PIX_FMT_UYVY422] = { |