diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 17:27:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-07 23:24:38 +0200 |
| commit | 9e5867743828c15773fedafe17a3126eb864a523 (patch) | |
| tree | 0d8c4faa96c57e1bf7529b67f53e0302a8574cfb | |
| parent | 54ae58802e9829a8b62edcbea683fe89a8c6fcfa (diff) | |
| download | ffmpeg-9e5867743828c15773fedafe17a3126eb864a523.tar.gz | |
avcodec/huffyuvenc: Make version 3 of ffvhuff non experimental
Tested-by: Tim Nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/huffyuvenc.c | 4 | ||||
| -rw-r--r-- | tests/fate/vcodec.mak | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 2a50a1bf9b..4a001b922c 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -345,8 +345,8 @@ static av_cold int encode_init(AVCodecContext *avctx) "using huffyuv 2.2.0 or newer interlacing flag\n"); } - if (s->version > 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { - av_log(avctx, AV_LOG_ERROR, "Ver > 2 is under development, files encoded with it may not be decodable with future versions!!!\n" + if (s->version > 3 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + av_log(avctx, AV_LOG_ERROR, "Ver > 3 is under development, files encoded with it may not be decodable with future versions!!!\n" "Use vstrict=-2 / -strict -2 to use it anyway.\n"); return AVERROR(EINVAL); } diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 490f898af5..af809371b4 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -59,10 +59,10 @@ fate-vsynth%-ffv1: ENCOPTS = -slices 4 fate-vsynth%-ffv1.0: CODEC = ffv1 FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 -fate-vsynth%-ffvhuff444: ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv444p -fate-vsynth%-ffvhuff420p12: ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv420p12le -fate-vsynth%-ffvhuff422p10left: ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv422p10le -pred left -fate-vsynth%-ffvhuff444p16: ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv444p16le -pred plane +fate-vsynth%-ffvhuff444: ENCOPTS = -vcodec ffvhuff -pix_fmt yuv444p +fate-vsynth%-ffvhuff420p12: ENCOPTS = -vcodec ffvhuff -pix_fmt yuv420p12le +fate-vsynth%-ffvhuff422p10left: ENCOPTS = -vcodec ffvhuff -pix_fmt yuv422p10le -pred left +fate-vsynth%-ffvhuff444p16: ENCOPTS = -vcodec ffvhuff -pix_fmt yuv444p16le -pred plane FATE_VCODEC-$(call ENCDEC, FLASHSV, FLV) += flashsv fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int @@ -89,7 +89,7 @@ fate-vsynth%-h263p: ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 - FATE_VCODEC-$(call ENCDEC, HUFFYUV, AVI) += huffyuv fate-vsynth%-huffyuv: ENCOPTS = -pix_fmt yuv422p -sws_flags neighbor -fate-vsynth%-huffyuv: DECOPTS = -strict -2 -sws_flags neighbor +fate-vsynth%-huffyuv: DECOPTS = -sws_flags neighbor FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int |