aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2011-02-01 21:56:13 +0100
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-02-08 13:20:56 +0100
commit440b61691db2166abac3f58e01da1d4722f1f1e4 (patch)
tree0deeec7918c59c94789b1826600ab4ccd8a34d6d
parent9409c3811c90975f2208216a0c5b820186e1e87b (diff)
downloadffmpeg-440b61691db2166abac3f58e01da1d4722f1f1e4.tar.gz
h264: define FF_PROFILE_H264_HIGH_444 to the correct value
It was removed in fe9a3fb since it had the wrong value. Add profile name for it.
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/h264.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e8d5f1a04f..c231804b34 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2274,6 +2274,7 @@ typedef struct AVCodecContext {
#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA)
#define FF_PROFILE_H264_HIGH_422 122
#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_444 144
#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA)
#define FF_PROFILE_H264_CAVLC_444 44
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b84430a1d7..e6f9ec9b8d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3396,6 +3396,7 @@ static const AVProfile profiles[] = {
{ FF_PROFILE_H264_HIGH_10_INTRA, "High 10 Intra" },
{ FF_PROFILE_H264_HIGH_422, "High 4:2:2" },
{ FF_PROFILE_H264_HIGH_422_INTRA, "High 4:2:2 Intra" },
+ { FF_PROFILE_H264_HIGH_444, "High 4:4:4" },
{ FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" },
{ FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" },
{ FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" },