OSDN Git Service

h264: define FF_PROFILE_H264_HIGH_444 to the correct value
authorJanne Grunau <janne-ffmpeg@jannau.net>
Tue, 1 Feb 2011 20:56:13 +0000 (21:56 +0100)
committerJanne Grunau <janne-ffmpeg@jannau.net>
Tue, 8 Feb 2011 12:20:56 +0000 (13:20 +0100)
It was removed in fe9a3fb since it had the wrong value. Add profile name
for it.

libavcodec/avcodec.h
libavcodec/h264.c

index e8d5f1a..c231804 100644 (file)
@@ -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
index b84430a..e6f9ec9 100644 (file)
@@ -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"           },