Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:23:19 +0000 (13:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:23:19 +0000 (13:23 +0100)
commit8d0b2aae71f01904e4a7ac0e8795592da5a0bd89
treee0bfc884210a851e22fd1acabb6b9e873cef5bb4
parentea96feddb7bb813c1e0c9befe9c96bf73996f841
parente96406eda4f143f101bd44372f7b2d542183000a
Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'

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

Conflicts:
libavformat/version.h

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