Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83'
authorClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 12:16:33 +0000 (14:16 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 12:16:33 +0000 (14:16 +0200)
commit4726bbb471566f7d2a0c883210870871a17fe2e3
tree712f8dad9b0478fd4f03de42f8ad7ea3f669b883
parente9bd45746511ab3a5803bc1b3490f4d682144289
parentd0a603a534a0ee4b255e5e72742428a7f7f42b83
Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83'

* commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83':
  examples/encode_video: set the framerate

Merged-by: Clément Bœsch <u@pkh.me>
doc/examples/encode_video.c