Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 13:00:03 +0000 (14:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 13:02:01 +0000 (14:02 +0100)
commit0a5da9cc148b2ac7102b4a0653c38735672629f6
treef20d33699f6f79a2daaaaa2513bb7fcc0f396a7e
parent950482bf587889c507340ae5893a851be8e99fcc
parentc6f1dc8e4cd967ae056698eafb891a08003c211c
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'

* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
  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>
libavformat/Makefile
libavformat/rtpdec.c
libavformat/rtpdec_formats.h
libavformat/rtpdec_h263.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_mpeg12.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_xiph.c