lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

The addition of reference-counted frames makes it pointless.

Anton Khirnov committed 12 years ago

Commit 5fcceda1 parent 141fdc75 files · +14 −5Browse files

Unified · Split

5 files

doc/APIchanges +4 −0
libavcodec/avcodec.h +4 −3
libavcodec/mpegvideo_enc.c +1 −2
libavcodec/options_table.h +2 −0
libavcodec/version.h +3 −0

doc/APIchanges+4−0

@@ -13,6 +13,10 @@ libavutil: 2013-12-xx · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2014-04-xx - xxxxxxx - avcodec.h
	17	+ Deprecate CODEC_FLAG_INPUT_PRESERVED. Its functionality is replaced by passing
	18	+ reference-counted frames to encoders.
	19	+
16	20	2014-04-xx - xxxxxxx - lavc 55.50.0 - dxva2.h
17	21	Add FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO for old Intel GPUs.
18	22

libavcodec/avcodec.h+4−3

@@ -671,12 +671,13 @@ typedef struct RcOverride{ · 670 unmodified lines
671	671	#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
672	672	#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
673	673	#define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>.
	674	+#if FF_API_INPUT_PRESERVED
674	675	/**
675		− * The parent program guarantees that the input for B-frames containing
676		− * streams is not written to for at least s->max_b_frames+1 frames, if
677		− * this is not set the input will be copied.
	676	+ * @deprecated passing reference-counted frames to the encoders replaces this
	677	+ * flag
678	678	*/
679	679	#define CODEC_FLAG_INPUT_PRESERVED 0x0100
	680	+#endif
680	681	#define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
681	682	#define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
682	683	#define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.

libavcodec/mpegvideo_enc.c+1−2

@@ -1081,8 +1081,7 @@ static int estimate_best_b_count(MpegEncContext *s) · 1080 unmodified lines
1081	1081
1082	1082	c->width = s->width >> scale;
1083	1083	c->height = s->height >> scale;
1084		− c->flags = CODEC_FLAG_QSCALE \| CODEC_FLAG_PSNR \|
1085		− CODEC_FLAG_INPUT_PRESERVED;
	1084	+ c->flags = CODEC_FLAG_QSCALE \| CODEC_FLAG_PSNR;
1086	1085	c->flags \|= s->avctx->flags & CODEC_FLAG_QPEL;
1087	1086	c->mb_decision = s->avctx->mb_decision;
1088	1087	c->me_cmp = s->avctx->me_cmp;

libavcodec/options_table.h+2−0

@@ -54,7 +54,9 @@ static const AVOption avcodec_options[] = { · 53 unmodified lines
54	54	{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},
55	55	{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V\|E, "flags"},
56	56	{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V\|E, "flags"},
	57	+#if FF_API_INPUT_PRESERVED
57	58	{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"},
	59	+#endif
58	60	{"pass1", "use internal 2-pass ratecontrol in first pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"},
59	61	{"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"},
60	62	{"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V\|E\|D, "flags"},

libavcodec/version.h+3−0

@@ -129,5 +129,8 @@ · 128 unmodified lines
129	129	#ifndef FF_API_ARCH_SPARC
130	130	#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56)
131	131	#endif
	132	+#ifndef FF_API_INPUT_PRESERVED
	133	+#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)
	134	+#endif
132	135
133	136	#endif /* AVCODEC_VERSION_H */