Merge commit '74942685cb457c01937686892878403a409baf27'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:43:28 +0000 (12:43 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:43:28 +0000 (12:43 +0200)
commit4e67382d72982a0670062f2f7e0567036d038c6e
treebf640b254616024bb42e8569a798ea5ce493d6bb
parenta11741c293939193657a82e6055a37dfc6ed910c
parent74942685cb457c01937686892878403a409baf27
Merge commit '74942685cb457c01937686892878403a409baf27'

* commit '74942685cb457c01937686892878403a409baf27':
  hls: Check av_opt_set_dict return value as well

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