summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/vaapi_decode.c1
-rw-r--r--libavcodec/vaapi_encode_h264.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
index 5ae98d8fd7..febe22a710 100644
--- a/libavcodec/vaapi_decode.c
+++ b/libavcodec/vaapi_decode.c
@@ -247,7 +247,6 @@ static const struct {
MAP(MPEG4, MPEG4_MAIN, MPEG4Main ),
MAP(H264, H264_CONSTRAINED_BASELINE,
H264ConstrainedBaseline),
- MAP(H264, H264_BASELINE, H264Baseline),
MAP(H264, H264_MAIN, H264Main ),
MAP(H264, H264_HIGH, H264High ),
#if VA_CHECK_VERSION(0, 37, 0)
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 1288249be7..3ff19d2c83 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -863,12 +863,13 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)
ctx->codec = &vaapi_encode_type_h264;
switch (avctx->profile) {
+ case FF_PROFILE_H264_BASELINE:
+ av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile is not "
+ "supported, using constrained baseline profile instead.\n");
+ avctx->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE;
case FF_PROFILE_H264_CONSTRAINED_BASELINE:
ctx->va_profile = VAProfileH264ConstrainedBaseline;
break;
- case FF_PROFILE_H264_BASELINE:
- ctx->va_profile = VAProfileH264Baseline;
- break;
case FF_PROFILE_H264_MAIN:
ctx->va_profile = VAProfileH264Main;
break;