Merge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:26:37 +0000 (23:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:27:01 +0000 (23:27 +0200)
* commit 'c385313d2590fd26e26bb9bdacddef78162ab490':
  rtsp: Support misordered fmtp rtpmap

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

Simple merge