Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/buffer.c
index 1bbfab8,fd0b18f..a626184
--- 1/libavfilter/buffer.c
--- 2/libavfilter/buffer.c
+++ b/libavfilter/buffer.c
@@@ -21,9 -17,8 +21,10 @@@
   */
  
  #include "libavutil/channel_layout.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
 +#include "libavutil/imgutils.h"
+ #include "libavutil/internal.h"
  #include "libavcodec/avcodec.h"
  
  #include "avfilter.h"