Browse Source

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>
tags/n2.3
Michael Niedermayer 12 years ago
parent
commit
ae4b11df0d
3 changed files with 4 additions and 10 deletions
  1. +0
    -6
      libavcodec/snowenc.c
  2. +1
    -1
      libavcodec/version.h
  3. +3
    -3
      tests/fate/vcodec.mak

+ 0
- 6
libavcodec/snowenc.c View File

@@ -38,12 +38,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
SnowContext *s = avctx->priv_data;
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
&& (avctx->flags & CODEC_FLAG_QSCALE)
&& avctx->global_quality == 0){


+ 1
- 1
libavcodec/version.h View File

@@ -30,7 +30,7 @@

#define LIBAVCODEC_VERSION_MAJOR 55
#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, \
LIBAVCODEC_VERSION_MINOR, \


+ 3
- 3
tests/fate/vcodec.mak View File

@@ -242,15 +242,15 @@ fate-vsynth%-rv20: ENCOPTS = -qscale 10
fate-vsynth%-rv20: FMT = rm

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 \
-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 \
-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

FATE_VCODEC-$(call ENCDEC, SVQ1, MOV) += svq1


Loading…
Cancel
Save