]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0483cfe ffb7669)
Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:22:51 +0000 (11:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:22:54 +0000 (11:22 +0200)
* commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825':
  rtmp: Support play method in listen mode

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.