]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 208f9dd f8d1bb6)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 11:03:44 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 11:03:50 +0000 (13:03 +0200)
* qatar/master:
  rtmp: rename main_channel_id to stream_id.

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.