Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Nov 2012 10:31:13 +0000 (11:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Nov 2012 10:31:13 +0000 (11:31 +0100)
commita9b1536a018b867e3458a278c2992f7cd2fb707d
tree55556d53044f7e8854f59c9eb7fcab76f3ea19d1
parent4d941eac1655b21af33c6e4d52b7bfd7f9e5b990
parentb74dbdd5e99aed7f3bf1ecb5da1b374e5ba35768
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@gmx.at>
12 files changed:
libavformat/avformat.h
libavformat/internal.h
libavformat/movenc.c
libavformat/movenchint.c
libavformat/rtp.c
libavformat/rtp.h
libavformat/rtpenc.c
libavformat/rtpenc_chain.c
libavformat/rtpenc_chain.h
libavformat/rtsp.c
libavformat/sapenc.c
libavformat/sdp.c