From cdac3acb11356be37e04b6d02cf75ce061d15aeb Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 5 Apr 2013 15:37:29 +0200 Subject: [PATCH 1/3] lavfi: add a bump and docs entries for the AVOptions switch --- Changelog | 1 + doc/APIchanges | 6 ++++++ libavfilter/version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 1c493c2dc8..5089ba7443 100644 --- a/Changelog +++ b/Changelog @@ -9,6 +9,7 @@ version 10: or vice versa - new avconv options -filter_script and -filter_complex_script, which allow a filtergraph description to be read from a file +- uniform options syntax across all filters version 9: diff --git a/doc/APIchanges b/doc/APIchanges index 91bbeecfa0..e4597b9413 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,12 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-xx-xx - lavfi 3.7.0 - avfilter.h + Add AVFilter.priv_class for exporting filter options through the AVOptions API + in the similar way private options work in lavc and lavf. + Add avfilter_get_class(). + Switch all filters to use AVOptions. + 2013-xx-xx - lavu 52.9.0 - pixdesc.h Add av_pix_fmt_count_planes() function for counting planes in a pixel format. diff --git a/libavfilter/version.h b/libavfilter/version.h index 914b7ca3fa..dde7952058 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 3 -#define LIBAVFILTER_VERSION_MINOR 6 +#define LIBAVFILTER_VERSION_MINOR 7 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ From 837112c0c84dd9de67421b57664933a0d27843f9 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 9 Apr 2013 22:01:10 +0200 Subject: [PATCH 2/3] af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a --- libavfilter/af_channelmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 8ed96768ab..da83009c41 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -122,7 +122,7 @@ static int get_channel(char **map, uint64_t *ch, char delim) static av_cold int channelmap_init(AVFilterContext *ctx) { ChannelMapContext *s = ctx->priv; - int ret; + int ret = 0; char *mapping, separator = '|'; int map_entries = 0; char buf[256]; From 2e81acc687e64d15dd93c74793060bb5a233f44d Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Sun, 7 Apr 2013 19:29:52 +0000 Subject: [PATCH 3/3] x86inc: Fix number of operands for cmp* instructions cmp{p,s}{s,d} instructions do take an imm8 operand. Signed-off-by: Diego Biurrun --- libavutil/x86/x86inc.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index bc8e4cb81e..f4be5d32a6 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1087,10 +1087,10 @@ AVX_INSTR blendpd, 1, 0, 0 AVX_INSTR blendps, 1, 0, 0 AVX_INSTR blendvpd, 1, 0, 0 AVX_INSTR blendvps, 1, 0, 0 -AVX_INSTR cmppd, 1, 0, 0 -AVX_INSTR cmpps, 1, 0, 0 -AVX_INSTR cmpsd, 1, 0, 0 -AVX_INSTR cmpss, 1, 0, 0 +AVX_INSTR cmppd, 1, 1, 0 +AVX_INSTR cmpps, 1, 1, 0 +AVX_INSTR cmpsd, 1, 1, 0 +AVX_INSTR cmpss, 1, 1, 0 AVX_INSTR cvtdq2ps, 1, 0, 0 AVX_INSTR cvtpd2dq, 1, 0, 0 AVX_INSTR cvtps2dq, 1, 0, 0