[FFmpeg-cvslog] Merge commit '42805eda554a7fc44341282771531e7837ac72b7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  9 11:41:56 2013 +0100| [8c3ae9ee66a2fb094b188c994a18df9f3e69a283] | committer: Michael Niedermayer

Merge commit '42805eda554a7fc44341282771531e7837ac72b7'

* commit '42805eda554a7fc44341282771531e7837ac72b7':
  rtpdec: Store the dynamic payload handler in the rtpdec context

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

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