* qatar/master: avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer Conflicts: libavfilter/buffer.c
Showing the changes to libavfilter/buffer.c (1 of 1 file). Show all
Unified · Split
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| 25 | #include "libavutil/common.h" | 25 | #include "libavutil/common.h" |
| 26 | #include "libavutil/imgutils.h" | 26 | #include "libavutil/imgutils.h" |
| 27 | #include "libavutil/internal.h" | ||
| 27 | #include "libavcodec/avcodec.h" | 28 | #include "libavcodec/avcodec.h" |
| 28 | 29 | ||
| 29 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| @@ -113,7 +114,9 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref) · 83 unmodified lines | |||
| 113 | 114 | ||
| 114 | void avfilter_unref_bufferp(AVFilterBufferRef **ref) | 115 | void avfilter_unref_bufferp(AVFilterBufferRef **ref) |
| 115 | { | 116 | { |
| 117 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 116 | avfilter_unref_buffer(*ref); | 118 | avfilter_unref_buffer(*ref); |
| 119 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 117 | *ref = NULL; | 120 | *ref = NULL; |
| 118 | } | 121 | } |
| 119 | 122 | ||