Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 13:49:13 +0000 (14:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 13:49:29 +0000 (14:49 +0100)
commit1bc3f1b73dfff1a23b9bad1d4fef32dcced47f64
tree5b2e1e2d120cc2f875519e2691b44716cfbc5ec9
parent74744790a366ed53cfafa2b0720c27b1eaef770a
parent4a7d3837b4dd17fff270b55166597c093204e542
Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'

* commit '4a7d3837b4dd17fff270b55166597c093204e542':
  buffersrc: Have function parameter names match between .c and .h file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/buffersrc.h