[FFmpeg-cvslog] Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 24 14:18:25 2013 +0100| [b4581e9394c9f97d08af814d09337ed16f21cfe0] | committer: Michael Niedermayer

Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'

* commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5':
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set

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

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