[FFmpeg-cvslog] Merge commit 'd5f5c90be9ec120f1320dcdd808b7bd917dee47c'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Dec 17 14:52:15 2015 +0100| [ea1000b9fe68f33b93cf1a104eb3feacb0867e88] | committer: Hendrik Leppkes

Merge commit 'd5f5c90be9ec120f1320dcdd808b7bd917dee47c'

* commit 'd5f5c90be9ec120f1320dcdd808b7bd917dee47c':
  rtsp: free opts dictionary on failure of getnameinfo

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

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