ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun Dec 8 22:43:19 2019 +0100| [935a52c887b5a448938d0a999c82004b6777b2ec] | committer: Michael Niedermayer
avcodec/ffv1enc: Use version 3 by default (CRCs by default) Version 3 is since 2013 (FFmpeg 2.1) non experimental so should be widely supported Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=935a52c887b5a448938d0a999c82004b6777b2ec --- libavcodec/ffv1enc.c | 3 ++- tests/fate/vcodec.mak | 2 +- tests/ref/fate/ffmpeg-loopback-decoding | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index ea7e6e8bd7..75e40771b6 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -623,7 +623,8 @@ av_cold int ff_ffv1_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } s->version = avctx->level; - } + } else if (s->version < 3) + s->version = 3; if (s->ec < 0) { if (s->version >= 4) { diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 09e241127c..cafe7dfb8d 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -161,7 +161,7 @@ FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 ffv1-v2 \ FATE_VCODEC_SCALE-$(call ENCDEC, FFV1, AVI) += ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ ffv1-v3-bgr0 ffv1-v3-rgb48 ffv1-2pass10 fate-vsynth%-ffv1: ENCOPTS = -slices 4 -fate-vsynth%-ffv1-v0: CODEC = ffv1 +fate-vsynth%-ffv1-v0: ENCOPTS = -level 0 fate-vsynth%-ffv1-v2: ENCOPTS = -level 2 -strict experimental fate-vsynth%-ffv1-v3-yuv420p: ENCOPTS = -level 3 -pix_fmt yuv420p fate-vsynth%-ffv1-v3-yuv422p10: ENCOPTS = -level 3 -pix_fmt yuv422p10 \ diff --git a/tests/ref/fate/ffmpeg-loopback-decoding b/tests/ref/fate/ffmpeg-loopback-decoding index ae92f32a37..06fa5ccd92 100644 --- a/tests/ref/fate/ffmpeg-loopback-decoding +++ b/tests/ref/fate/ffmpeg-loopback-decoding @@ -1,5 +1,5 @@ -e4e0e27eb8ed99eedc2458d92401c5e4 *tests/data/fate/ffmpeg-loopback-decoding.nut -7435259 tests/data/fate/ffmpeg-loopback-decoding.nut +aa7b6ff7c731fc5bfc331db8b234a6ce *tests/data/fate/ffmpeg-loopback-decoding.nut +7182759 tests/data/fate/ffmpeg-loopback-decoding.nut #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
