Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:40:19 +0000 (14:40 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:40:19 +0000 (14:40 +0200)
commit7c6ae9ca0489aa3f355973f66ed7c28097ff6126
tree9703ab1a6c240fdf613b1c10fd0c5deb2624504f
parentf9a186c59b4c8fc65dd8298e62a76cb4a01ffc13
parentac84e618df4765ba751327497994066d0931e6a8
Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'

* commit 'ac84e618df4765ba751327497994066d0931e6a8':
  avfiltergraph: check the query_formats() return value

This commit is a noop, see 6a4c5c730ed67a7f472e43205fd96e91781796ce

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>