Merge commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:33:45 +0000 (22:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:33:49 +0000 (22:33 +0100)
commit4c8a556a773c9706618b8e5d14b68a06631fb79f
treea5720f08f734268d88502845e0f99ebe4bd8b4e8
parent2bedcbf82274c08ad137257ed6d81962cf3a9ffd
parentb7a4c319fda22aa91ce29692d728ec6103b514f6
Merge commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6'

* commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6':
  rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler

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