From 92f649b411eb2c4a064a00017a338f7de7a2ba86 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 23 Oct 2013 19:52:18 +0200
Subject: [PATCH] avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL
Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/hevc.c | 2 +-
libavcodec/version.h | 2 +-
tests/fate/hevc.mak | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index a395bc90871..4ea26bf825b 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2870,5 +2870,5 @@ AVCodec ff_hevc_decoder = {
.flush = hevc_decode_flush,
.update_thread_context = hevc_update_thread_context,
.init_thread_copy = hevc_init_thread_copy,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS | CODEC_CAP_EXPERIMENTAL,
+ .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS,
};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index db43b83db0e..40159d85868 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 38
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 777b3718222..b3fa6cff540 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -98,7 +98,7 @@ FATE_HEVC_SEI = \
define FATE_HEVC_SEI_TEST
FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = ffmpeg -strict -2 -err_detect +explode -xerror -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -f null -
+fate-hevc-conformance-$(1): CMD = ffmpeg -err_detect +explode -xerror -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -f null -
fate-hevc-conformance-$(1): CMP = null
fate-hevc-conformance-$(1): REF = /dev/null
endef
@@ -149,13 +149,13 @@ FATE_HEVC_FRAMECRC = \
define FATE_HEVC_FRAMECRC_TEST
FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -strict -2 -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
endef
$(foreach N,$(FATE_HEVC_FRAMECRC),$(eval $(call FATE_HEVC_FRAMECRC_TEST,$(N))))
FATE_HEVC += fate-hevc-conformance-DBLK_A_MAIN10_VIXS_2
-fate-hevc-conformance-DBLK_A_MAIN10_VIXS_2: CMD = framecrc -strict -2 -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/DBLK_A_MAIN10_VIXS_2.bit -pix_fmt yuv420p10le
+fate-hevc-conformance-DBLK_A_MAIN10_VIXS_2: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/DBLK_A_MAIN10_VIXS_2.bit -pix_fmt yuv420p10le
FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
--
GitLab