[FFmpeg-cvslog] h264: add profile names for the existing defines
Anssi Hannula
git
Wed Feb 2 03:56:26 CET 2011
ffmpeg | branch: master | Anssi Hannula <anssi.hannula at iki.fi> | Sat Jan 22 00:58:52 2011 +0200| [45eaec3029b0a84260a6f4c447c60a9645b1bceb] | committer: Michael Niedermayer
h264: add profile names for the existing defines
Signed-off-by: Janne Grunau <janne-ffmpeg at jannau.net>
(cherry picked from commit 71e0bee9eabe8eea030e210f1ad74c380b8b250b)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45eaec3029b0a84260a6f4c447c60a9645b1bceb
---
libavcodec/h264.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 774e97d..b84430a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3386,6 +3386,21 @@ av_cold int ff_h264_decode_end(AVCodecContext *avctx)
return 0;
}
+static const AVProfile profiles[] = {
+ { FF_PROFILE_H264_BASELINE, "Baseline" },
+ { FF_PROFILE_H264_CONSTRAINED_BASELINE, "Constrained Baseline" },
+ { FF_PROFILE_H264_MAIN, "Main" },
+ { FF_PROFILE_H264_EXTENDED, "Extended" },
+ { FF_PROFILE_H264_HIGH, "High" },
+ { FF_PROFILE_H264_HIGH_10, "High 10" },
+ { 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_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" },
+ { FF_PROFILE_UNKNOWN },
+};
AVCodec ff_h264_decoder = {
"h264",
@@ -3399,6 +3414,7 @@ AVCodec ff_h264_decoder = {
/*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
.flush= flush_dpb,
.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
+ .profiles = NULL_IF_CONFIG_SMALL(profiles),
};
#if CONFIG_H264_VDPAU_DECODER
@@ -3415,5 +3431,6 @@ AVCodec ff_h264_vdpau_decoder = {
.flush= flush_dpb,
.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
+ .profiles = NULL_IF_CONFIG_SMALL(profiles),
};
#endif
More information about the ffmpeg-cvslog
mailing list