[FFmpeg-cvslog] Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 17 14:06:06 2012 +0100| [8d07bbca6360a938c607dab4dcb333e12f3d915b] | committer: Michael Niedermayer

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 at gmx.at>

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