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)
commiteb02f0c6e83386bf8a13ab8113e5d8cff9fa72d3
tree60ccade1cb0c5ae059ff26337f6e40c3210efeaf
parent8d745281a489f0f69b00a99345c4a63026082eff
parentf4d371b9737c0405b3bc46d7ca0c856c0a8616b1
Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'

* commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1':
  rtsp: Don't include the listen flag in the SDP demuxer flags

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