Merge commit '8833f1508b7b6afc3172a8017934a7a54428c686'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 19 Apr 2016 13:43:23 +0000 (14:43 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 19 Apr 2016 13:43:23 +0000 (14:43 +0100)
This commit is a no-op.

* commit '8833f1508b7b6afc3172a8017934a7a54428c686':
  opt: Add const to av_opt_next

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

Trivial merge