diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-05 22:35:30 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-10 03:46:07 +0200 |
| commit | 159bcb19b9482a98652ded9eee2751e9de0e9d0f (patch) | |
| tree | e44af11388911406408afc24e06bb0fbdc7686c7 /libavcodec | |
| parent | d0dcfaef517105cf5f43f686bf2827c412c351ab (diff) | |
| download | ffmpeg-159bcb19b9482a98652ded9eee2751e9de0e9d0f.tar.gz | |
avcodec/mpegvideo_enc: Remove redundant pixel format checks
All encoders using ff_mpv_encode_init() already have pix_fmts set
so that the pixel format is already checked in ff_encode_preinit().
The one exception to this is MJPEG whose check remains.
(Btw: The AVCodec.pix_fmts check for AMV is stricter than the check
in ff_mpv_encode_init().)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 85a1e2c2d9..862e345017 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -302,16 +302,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) mpv_encode_defaults(s); switch (avctx->codec_id) { - case AV_CODEC_ID_MPEG2VIDEO: - if (avctx->pix_fmt != AV_PIX_FMT_YUV420P && - avctx->pix_fmt != AV_PIX_FMT_YUV422P) { - av_log(avctx, AV_LOG_ERROR, - "only YUV420 and YUV422 are supported\n"); - return AVERROR(EINVAL); - } - break; case AV_CODEC_ID_MJPEG: - case AV_CODEC_ID_AMV: format_supported = 0; /* JPEG color space */ if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || @@ -334,20 +325,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } break; - case AV_CODEC_ID_SPEEDHQ: - if (avctx->pix_fmt != AV_PIX_FMT_YUV420P && - avctx->pix_fmt != AV_PIX_FMT_YUV422P && - avctx->pix_fmt != AV_PIX_FMT_YUV444P) { - av_log(avctx, AV_LOG_ERROR, - "only YUV420/YUV422/YUV444 are supported (no alpha support yet)\n"); - return AVERROR(EINVAL); - } - break; - default: - if (avctx->pix_fmt != AV_PIX_FMT_YUV420P) { - av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); - return AVERROR(EINVAL); - } } switch (avctx->pix_fmt) { |