diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:40:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:40:05 +0200 |
| commit | 42f7c45d7b856839fa613c22645d5bff5352fc87 (patch) | |
| tree | 41afdc71546c3d5b52d06df062fb58f59056b3fe /ffmpeg.c | |
| parent | 15ca3ab82531e907c810674fc2c79e5e0b522c74 (diff) | |
| parent | 7d99c92945e4b2d12ed2126365482e1900340da0 (diff) | |
| download | ffmpeg-42f7c45d7b856839fa613c22645d5bff5352fc87.tar.gz | |
Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'
* commit '7d99c92945e4b2d12ed2126365482e1900340da0':
udp: Keep track of include and exclude sources separately
Conflicts:
libavformat/udp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions