]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 08:41:24 +0000 (10:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 08:41:32 +0000 (10:41 +0200)
* commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1':
  rtsp: Don't include the listen flag in the SDP demuxer flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtsp.c

Simple merge