diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:51:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:51:14 +0200 |
| commit | 0b712f5d5e5f1552940ea1ad074f6298f6397a24 (patch) | |
| tree | a5c82385698c5b669cb7bd60a3ffb4fdec3841b2 /libavformat/id3v2.c | |
| parent | 42f7c45d7b856839fa613c22645d5bff5352fc87 (diff) | |
| parent | 74972220909787af5a3ffe66f7fa8041827c2bd2 (diff) | |
| download | ffmpeg-0b712f5d5e5f1552940ea1ad074f6298f6397a24.tar.gz | |
Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'
* commit '74972220909787af5a3ffe66f7fa8041827c2bd2':
rtpproto: Support more than one SSM include address, support excludes
Conflicts:
libavformat/rtpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v2.c')
0 files changed, 0 insertions, 0 deletions