From: Janne Grunau Date: Tue, 1 Feb 2011 20:56:13 +0000 (+0100) Subject: h264: define FF_PROFILE_H264_HIGH_444 to the correct value X-Git-Tag: android-x86-4.4-r1~18506 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=154f7bb062c8535a1d76dd911e93a35a85503390;p=android-x86%2Fexternal-ffmpeg.git 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. (cherry picked from commit 440b61691db2166abac3f58e01da1d4722f1f1e4) --- diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3904245181..09f0a12b00 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2281,6 +2281,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" },