[FFmpeg-cvslog] h264: define FF_PROFILE_H264_HIGH_444 to the correct value

Janne Grunau git
Wed Feb 9 04:00:10 CET 2011


ffmpeg | branch: master | Janne Grunau <janne-ffmpeg at jannau.net> | Tue Feb  1 21:56:13 2011 +0100| [154f7bb062c8535a1d76dd911e93a35a85503390] | committer: Michael Niedermayer

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)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=154f7bb062c8535a1d76dd911e93a35a85503390
---

 libavcodec/avcodec.h |    1 +
 libavcodec/h264.c    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3904245..09f0a12 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 b84430a..e6f9ec9 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"           },




More information about the ffmpeg-cvslog mailing list