Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 22:23:15 +0000 (00:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 22:23:15 +0000 (00:23 +0200)
* commit '67a7695c142561fe60f21adffe89c133385d37c9':
  avfilter: Remove unused variable from ff_get_video_buffer()

Conflicts:
libavfilter/video.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/video.c

@@@ -110,8 -105,7 +110,7 @@@ AVFrame *ff_get_video_buffer(AVFilterLi
  {
      AVFrame *ret = NULL;
  
-     av_unused char buf[16];
 -    FF_DPRINTF_START(NULL, get_video_buffer); ff_dlog_link(NULL, link, 0);
 +    FF_TPRINTF_START(NULL, get_video_buffer); ff_tlog_link(NULL, link, 0);
  
      if (link->dstpad->get_video_buffer)
          ret = link->dstpad->get_video_buffer(link, w, h);