Module: ffmpeg
Branch: master
Commit: 440b61691db2166abac3f58e01da1d4722f1f1e4

Author: Janne Grunau <[email protected]>
Date:   Tue Feb  1 21:56:13 2011 +0100

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.

---

 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 e8d5f1a..c231804 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 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"           },

_______________________________________________
ffmpeg-commits mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-commits

Reply via email to