Merge commit '636515c324facaa14ccd8ab0732740a240a31ba9'
authorClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 12:24:20 +0000 (14:24 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 12:24:20 +0000 (14:24 +0200)
commit63c41c53f355d4a00d4601e6ee014e9c3ad3c289
tree4c54d8a367c951230f854c5a96f760d47ab8951e
parentfdbc29ca70a6f16c92a16cfcf3fdd639e0825b0d
parent636515c324facaa14ccd8ab0732740a240a31ba9
Merge commit '636515c324facaa14ccd8ab0732740a240a31ba9'

* commit '636515c324facaa14ccd8ab0732740a240a31ba9':
  examples/decode_video: remove a stray unrelated comment

This commit is a noop, see 8c4753f7f5f1f65532e841cffa3b4fdb368c2fdf

Merged-by: Clément Bœsch <u@pkh.me>