Merge commit '42805eda554a7fc44341282771531e7837ac72b7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jan 2013 10:41:56 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jan 2013 10:42:01 +0000 (11:42 +0100)
* commit '42805eda554a7fc44341282771531e7837ac72b7':
  rtpdec: Store the dynamic payload handler in the rtpdec context

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

Simple merge
Simple merge