[FFmpeg-cvslog] avcodec/snowenc: make snow non experimental
Michael Niedermayer
git at videolan.org
Sat Mar 22 17:04:44 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 18:16:21 2014 +0100| [ae4b11df0d9edfdb9e3bb983f17487540d1ceabc] | committer: Michael Niedermayer
avcodec/snowenc: make snow non experimental
After this commit the created bitstream will be supported by future
decoders.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae4b11df0d9edfdb9e3bb983f17487540d1ceabc
---
libavcodec/snowenc.c | 6 ------
libavcodec/version.h | 2 +-
tests/fate/vcodec.mak | 6 +++---
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 2195764..ace2648 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -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){
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 381e471..80c71cf 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -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, \
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 5c8c197..490f898 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -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
More information about the ffmpeg-cvslog
mailing list