[FFmpeg-cvslog] Merge commit '7f57ea143c55ce5732ef7e31e4b75ae6c307af13'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Dec  7 15:55:51 2015 +0100| [ee367fadf5c1bcdf07fc0e4440c405ef74211733] | committer: Hendrik Leppkes

Merge commit '7f57ea143c55ce5732ef7e31e4b75ae6c307af13'

* commit '7f57ea143c55ce5732ef7e31e4b75ae6c307af13':
  vsrc_color: Drop unneeded variable

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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