highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

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

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-05 12:17:35 +01:00
commit be74cb5159
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/buffer.c
View File

@ -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)
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;
} }