[FFmpeg-cvslog] Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'

[Hendrik Leppkes]

ffmpeg | branch: release/3.1 | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Jun 26 15:37:34 2016 +0200| [c9ee36e60ffb2986acf7decacf6ef6e1da657d61] | committer: Hendrik Leppkes

Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'

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

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

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