diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-20 00:23:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-20 00:23:15 +0200 |
commit | 5a22877e9d191e1c5ab1994718d31314ce067db0 (patch) | |
tree | 8cf89eef47701841e1a28b4c1c65b13bc3a82103 /libavfilter | |
parent | 201a511bb9dd3c988e5c5ebd69811a6509909e8f (diff) | |
parent | 67a7695c142561fe60f21adffe89c133385d37c9 (diff) | |
download | ffmpeg-5a22877e9d191e1c5ab1994718d31314ce067db0.tar.gz |
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>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c index 74c9161b13..6a554834b3 100644 --- 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) |