-
Michael Niedermayer authored
* commit '857e6667': rtmpproto: Clarify a comment Conflicts: libavformat/rtmpproto.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
a105c1f2
* commit '857e6667': rtmpproto: Clarify a comment Conflicts: libavformat/rtmpproto.c Merged-by:Michael Niedermayer <michaelni@gmx.at>