Merge commit '2e81acc6'

* commit '2e81acc6':
  x86inc: Fix number of operands for cmp* instructions
  af_channelmap: fix uninitialized variable use introduced in ba8efac9
  lavfi: add a bump and docs entries for the AVOptions switch

Conflicts:
	Changelog
	doc/APIchanges
	libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Changelog

@@ -18,6 +18,7 @@ version <next>:
 - audio phaser filter
 - separatefields filter
 - libquvi demuxer
+- uniform options syntax across all filters
 
 
 version 1.2:

doc/APIchanges

@@ -156,6 +156,12 @@ API changes, most recent first:
 2012-03-26 - a67d9cf - lavfi 2.66.100
   Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
 
+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.
 

libavfilter/version.h

@@ -29,8 +29,8 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  3
-#define LIBAVFILTER_VERSION_MINOR  50
-#define LIBAVFILTER_VERSION_MICRO 103
+#define LIBAVFILTER_VERSION_MINOR  51
+#define LIBAVFILTER_VERSION_MICRO 100
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \