]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1c341f 9f23f77)
Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:37:31 +0000 (16:37 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:37:31 +0000 (16:37 +0100)
* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56':
  rtmpproto: Don't include the libavformat version as "clientid"

Merged-by: Clément Bœsch <u@pkh.me>
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.