diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2011-01-22 00:58:52 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-02-01 20:37:02 +0100 |
| commit | 71e0bee9eabe8eea030e210f1ad74c380b8b250b (patch) | |
| tree | 3644a786518407a90db8285453ef384b3e59423d /libavcodec/h264.c | |
| parent | fe9a3fbe42ebe5debd57550313ed4c3a065f1770 (diff) | |
| download | ffmpeg-71e0bee9eabe8eea030e210f1ad74c380b8b250b.tar.gz | |
h264: add profile names for the existing defines
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 774e97dae9..b84430a1d7 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 |