[FFmpeg-cvslog] Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan  4 13:23:19 2013 +0100| [8d0b2aae71f01904e4a7ac0e8795592da5a0bd89] | committer: Michael Niedermayer

Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'

* commit 'e96406eda4f143f101bd44372f7b2d542183000a':
  rtsp: Add support for depacketizing RTP data via custom IO

Conflicts:
	libavformat/version.h

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

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