Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:37:34 +0000 (15:37 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:37:34 +0000 (15:37 +0200)
commitc9ee36e60ffb2986acf7decacf6ef6e1da657d61
treea59c7c8573fe4b41e809197c0e4fdd91b33d78e9
parent4e6f2dbcd3ca0cee45a174ed8e50038810f7177b
parent80fb19bc234a3f2350d891adf39f3738a8e4849f
Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'

* commit '80fb19bc234a3f2350d891adf39f3738a8e4849f':
  avconv: fix a check for av_bsf_get_by_name() return value

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