aboutsummaryrefslogtreecommitdiff
path: root/libavutil/pixdesc.h
diff options
context:
space:
mode:
authorMichael Niedermayer2014-08-04 21:24:24 +0200
committerMichael Niedermayer2014-08-04 21:32:03 +0200
commit073c074447c253111790c0472fb83f184e66814e (patch)
tree860cb3c06dc2928f2a6daa5086cc60f3cd3b7180 /libavutil/pixdesc.h
parent8862c49661fb0655882a78547ca70561f2c5d766 (diff)
parentd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26 (diff)
Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'
* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26': pixdesc: Support pixelformat aliases Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.h')
-rw-r--r--libavutil/pixdesc.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index 05862802da..41e81dbe13 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -98,6 +98,11 @@ typedef struct AVPixFmtDescriptor {
* otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
*/
AVComponentDescriptor comp[4];
+
+ /**
+ * Alternative comma-separated names.
+ */
+ const char *alias;
} AVPixFmtDescriptor;
/**