Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 13:34:24 +0000 (15:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 13:34:27 +0000 (15:34 +0200)
commit3dda0bbe4250f11a3bd3edd2e6da4b2cda070f50
tree7d42a6bed030864e0ebcbff5b3ca582d079b574a
parent6cf9d02cea5e9ebc46ae037eb003a9353a38f5b1
parente65c776d18dc14df8a279e017760862f9fc8763b
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'

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

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