diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 10:30:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 10:30:35 +0200 |
| commit | 4d4f5911d3121133929da7b859755860f93684fd (patch) | |
| tree | 25ca85b33909e89c0eb65b289158d14c79264af5 /libavformat/rtmp.h | |
| parent | 5711e4fd111a20afce15c90cb9b8d486f869a4e5 (diff) | |
| parent | 28306e6d620c109ddd672f7243adfbc2bbb3b18f (diff) | |
| download | ffmpeg-4d4f5911d3121133929da7b859755860f93684fd.tar.gz | |
Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'
* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
network: factor out bind-listening code
use my full first name instead of short one in copyrights
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmp.h')
| -rw-r--r-- | libavformat/rtmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmp.h b/libavformat/rtmp.h index 7c9bb6d766..8fc8040d89 100644 --- a/libavformat/rtmp.h +++ b/libavformat/rtmp.h @@ -1,6 +1,6 @@ /* * RTMP definitions - * Copyright (c) 2009 Kostya Shishkov + * Copyright (c) 2009 Konstantin Shishkov * * This file is part of FFmpeg. * |