Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Nov 2013 11:17:35 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Nov 2013 11:17:35 +0000 (12:17 +0100)
* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/buffer.c

   */
  
  #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"