Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:18:25 +0000 (14:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:18:30 +0000 (14:18 +0100)
* 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@gmx.at>
1  2 
libavformat/rtp.c
libavformat/rtpenc_chain.c

Simple merge
Simple merge