[FFmpeg-cvslog] Merge commit '74942685cb457c01937686892878403a409baf27'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 12:43:28 2015 +0200| [4e67382d72982a0670062f2f7e0567036d038c6e] | committer: Hendrik Leppkes

Merge commit '74942685cb457c01937686892878403a409baf27'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e67382d72982a0670062f2f7e0567036d038c6e
---