projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9943c5a a28468d)
Merge commit 'a28468d0daf4be14761c16a3ddd33266b2380123'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 01:55:23 +0000 (02:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 01:56:18 +0000 (02:56 +0100)
* commit 'a28468d0daf4be14761c16a3ddd33266b2380123':
  librtmp: append the correct field to the string

See: d1970929b5f8b873aac171586343c9d8142897ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
FFmpeg git repo