1. ffmpeg
  2. Commit 5a22877e9d191e1c5ab1994718d31314ce067db0
Browse code

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>

Michael Niedermayer authored on 2014/08/20 07:23:15
Showing 1 changed files
libavfilter/video.c
History View file @ 5a22877
... ... 
@@ -110,7 +110,6 @@ AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h)
110 110 
 {
111 111 
     AVFrame *ret = NULL;
112 112
113 
-    av_unused char buf[16];
114 113 
     FF_TPRINTF_START(NULL, get_video_buffer); ff_tlog_link(NULL, link, 0);
115 114
116 115 
     if (link->dstpad->get_video_buffer)