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)
* commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6':
  rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler

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

Simple merge
Simple merge