Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 22 Apr 2016 16:21:52 +0000 (17:21 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 22 Apr 2016 16:21:52 +0000 (17:21 +0100)
commit53a9b164c560eba511cab60e9ba382f4d9af5980
tree34d96dcc6267aff5d0fddd948c959e9e0069f426
parenta980cc47cd01b007ecb6ac2445b7894c9d237c18
parent704a39769719d2e1ae3f13bfc562b51c9cd002d7
Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'

* commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7':
  rtmpdh: add an stdio.h include

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/rtmpdh.c