Merge commit '27852f2f1dec3749ea79883b70484c841169f747'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 18:47:20 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 18:58:11 +0000 (20:58 +0200)
commit71288bf80f37bdc0795396930d8b97c781c94587
tree3e502a3e068ec8fe330b3a26be240400359d0cff
parent7ef59803e80952ae9392d86c85f1fcf408cdfcd2
parent27852f2f1dec3749ea79883b70484c841169f747
Merge commit '27852f2f1dec3749ea79883b70484c841169f747'

* commit '27852f2f1dec3749ea79883b70484c841169f747':
  libavformat: Handle error return from ff_listen_bind

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/tcp.c
libavformat/unix.c