[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 15 11:31:13 2012 +0100| [a9b1536a018b867e3458a278c2992f7cd2fb707d] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bgmc: Fix av_malloc checks in ff_bgmc_init()
  rtp: set the payload type as stream id

Conflicts:
	libavformat/rtpenc_chain.c

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

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