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)
commit5a22877e9d191e1c5ab1994718d31314ce067db0
tree8cf89eef47701841e1a28b4c1c65b13bc3a82103
parent201a511bb9dd3c988e5c5ebd69811a6509909e8f
parent67a7695c142561fe60f21adffe89c133385d37c9
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>
libavfilter/video.c