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)
commitc54d835e2f185f621ea6cda31a9ef5f83e4a4194
treed6c2a3a6e91add4e2b6ccc9e7904e1c34898990e
parent90eb24996913238e1ad23d412fa3fa0fd93243c0
parent8833f1508b7b6afc3172a8017934a7a54428c686
Merge commit '8833f1508b7b6afc3172a8017934a7a54428c686'

This commit is a no-op.

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

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