Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'

* commit '67a7695c142561fe60f21adffe89c133385d37c9': avfilter: Remove unused variable from ff_get_video_buffer() Conflicts: libavfilter/video.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 5a22877e9d
parent 201a511bb9 67a7695c14
commit 5a22877e9d
1 changed files with 0 additions and 1 deletions
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@ -110,7 +110,6 @@ AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h)
 {
    AVFrame *ret = NULL;

-    av_unused char buf[16];
    FF_TPRINTF_START(NULL, get_video_buffer); ff_tlog_link(NULL, link, 0);

    if (link->dstpad->get_video_buffer)