diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-20 10:37:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-20 10:39:53 +0200 |
| commit | 48353325372ae7c1721c55bafe33cf0816301a5e (patch) | |
| tree | 02c84e6d19e4caba3afb91dbb5771cea7216dcb2 /libavcodec/mjpeg2jpeg_bsf.c | |
| parent | 73b2043d727029ecde19c1d92bda8411f18b8e55 (diff) | |
| parent | 36fb0d02a1faa11eaee51de01fb4061ad6092af9 (diff) | |
| download | ffmpeg-48353325372ae7c1721c55bafe33cf0816301a5e.tar.gz | |
Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'
* commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9':
rtsp: Support multicast source filters (RFC 4570)
rtpproto: Check the source IP if one single source has been specified
rtpproto: Support IGMPv3 source specific multicast inclusion
Conflicts:
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
0 files changed, 0 insertions, 0 deletions