Michael Niedermayer 8d07bbca63 Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' ...

* commit 'f322b2073581119de5da74f92a03309a36891cfa':
  lavr: only save/restore the mixing matrix if mixing is being done
  rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
  rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

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

2012-12-17 14:06:11 +01:00

19 KiB

Raw Blame History

View Raw