[FFmpeg-cvslog] Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 13:52:06 2013 +0100| [950482bf587889c507340ae5893a851be8e99fcc] | committer: Michael Niedermayer

Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'

* commit '2326558d5277ec87ba6d607a01ec6acfc51c694c':
  rtpdec: Split mpegts parsing to a normal depacketizer
  rtpdec: Reorder payload handler registration alphabetically

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

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