[FFmpeg-cvslog] Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 17 15:34:24 2014 +0200| [3dda0bbe4250f11a3bd3edd2e6da4b2cda070f50] | committer: Michael Niedermayer

Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'

* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
  rtmpproto: Add getStreamLength call to query duration

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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