RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/snowenc: make snow non experimental 

After this commit the created bitstream will be supported by future
decoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-13 18:16:21 +01:00
parent 3eafe1d71c
commit ae4b11df0d
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/snowenc.c
View File

@ -38,12 +38,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
SnowContext *s = avctx->priv_data; SnowContext *s = avctx->priv_data;
int plane_index, ret; int plane_index, ret;
if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
av_log(avctx, AV_LOG_ERROR, "This codec 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 -1;
}
if(avctx->prediction_method == DWT_97 if(avctx->prediction_method == DWT_97
&& (avctx->flags & CODEC_FLAG_QSCALE) && (avctx->flags & CODEC_FLAG_QSCALE)
&& avctx->global_quality == 0){ && avctx->global_quality == 0){

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 52 #define LIBAVCODEC_VERSION_MINOR 52
#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_MICRO 103
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \

6
tests/fate/vcodec.mak
View File

@ -242,15 +242,15 @@ fate-vsynth%-rv20: ENCOPTS = -qscale 10
fate-vsynth%-rv20: FMT = rm fate-vsynth%-rv20: FMT = rm
FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow snow-hpel snow-ll FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow snow-hpel snow-ll
fate-vsynth%-snow: ENCOPTS = -strict -2 -qscale 2 -flags +qpel \ fate-vsynth%-snow: ENCOPTS = -qscale 2 -flags +qpel \
-me_method iter -dia_size 2 \ -me_method iter -dia_size 2 \
-cmp 12 -subcmp 12 -s 128x64 -cmp 12 -subcmp 12 -s 128x64
fate-vsynth%-snow-hpel: ENCOPTS = -strict -2 -qscale 2 \ fate-vsynth%-snow-hpel: ENCOPTS = -qscale 2 \
-me_method iter -dia_size 2 \ -me_method iter -dia_size 2 \
-cmp 12 -subcmp 12 -s 128x64 -cmp 12 -subcmp 12 -s 128x64
fate-vsynth%-snow-ll: ENCOPTS = -strict -2 -qscale .001 -pred 1 \ fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \
-flags +mv4+qpel -flags +mv4+qpel
FATE_VCODEC-$(call ENCDEC, SVQ1, MOV) += svq1 FATE_VCODEC-$(call ENCDEC, SVQ1, MOV) += svq1