Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 12:52:06 +0000 (13:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 12:52:42 +0000 (13:52 +0100)
commit950482bf587889c507340ae5893a851be8e99fcc
tree8ab3a6cb2b895518df5a594c69144985dc0e7cc8
parentc3f3c2256325532eb9ee8a44f1f43c31de79eb2f
parent2326558d5277ec87ba6d607a01ec6acfc51c694c
Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'

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

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