[FFmpeg-cvslog] Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 12 14:49:13 2014 +0100| [1bc3f1b73dfff1a23b9bad1d4fef32dcced47f64] | committer: Michael Niedermayer

Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bc3f1b73dfff1a23b9bad1d4fef32dcced47f64
---