[FFmpeg-cvslog] Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 14:00:03 2013 +0100| [0a5da9cc148b2ac7102b4a0653c38735672629f6] | committer: Michael Niedermayer

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 at gmx.at>

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