[FFmpeg-cvslog] Merge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 16:10:10 2016 +0100| [3bf368a2a643291442829bf2b7583f7a8a0eee47] | committer: Derek Buitenhuis

Merge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'

This commit is a no-op.

* commit '84b5dcf27589b32713a4ba0723a129156b4d2408':
  asfenc: remove an unused variable

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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