Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 15:28:36 +0000 (16:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 15:28:36 +0000 (16:28 +0100)
commit8a4464514fac40988f4d10e6419a8e1632dfba0c
tree1ab932999f4b3ed6c77b14f663705828be238b57
parent85e94a30eeb97ac73959fa0e330c5c68e31942e6
parent3d67f52f9dcc60cd3a660ea363762575f3779df7
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
  Prepare for 9.2 Release
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtp.c
libavformat/rtpenc_chain.c