[FFmpeg-cvslog] Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 10:41:24 2013 +0200| [eb02f0c6e83386bf8a13ab8113e5d8cff9fa72d3] | committer: Michael Niedermayer

Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb02f0c6e83386bf8a13ab8113e5d8cff9fa72d3
---