From: Clément Bœsch <u@pkh.me>
Date: Sat, 8 Apr 2017 12:51:27 +0000 (+0200)
Subject: Merge commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca'
X-Git-Tag: n3.5-dev~2077
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3f06dfcdc6e9f9c671080dc681ee18717e662daf

Merge commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca'

* commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca':
  examples: fix a typo in an error message

This commit is a noop, see 3aa1ff30f3f44a2ee980556a9bd6c0bc7d9087ac

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

3f06dfcdc6e9f9c671080dc681ee18717e662daf