]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cf9d02 e65c776)
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)
* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
  rtmpproto: Add getStreamLength call to query duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmpproto.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/rtmpproto.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.