Merge commit '67a7695c'

* commit '67a7695c': avfilter: Remove unused variable from ff_get_video_buffer() Conflicts: libavfilter/video.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '67a7695c'
* commit '67a7695c': avfilter: Remove unused variable from ff_get_video_buffer() Conflicts: libavfilter/video.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5a22877e · Michael Niedermayer · 201a511b · 67a7695c · 5a22877e
Commit 5a22877e authored Aug 19, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

video.c libavfilter/video.c +0 -1

No files found.
--- 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)