* commit 'c6f1dc8e':
  rtpdec: Move setting the parsing flags to the actual depacketizers
  rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer

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