Commit be74cb51 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

Conflicts:
	libavfilter/buffer.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6a7de236 7d1a68e9
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "avfilter.h" #include "avfilter.h"
...@@ -113,7 +114,9 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref) ...@@ -113,7 +114,9 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref)
void avfilter_unref_bufferp(AVFilterBufferRef **ref) void avfilter_unref_bufferp(AVFilterBufferRef **ref)
{ {
FF_DISABLE_DEPRECATION_WARNINGS
avfilter_unref_buffer(*ref); avfilter_unref_buffer(*ref);
FF_ENABLE_DEPRECATION_WARNINGS
*ref = NULL; *ref = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment