Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Dec 2012 13:06:06 +0000 (14:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Dec 2012 13:06:11 +0000 (14:06 +0100)
* 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>
1  2 
libavformat/rtpdec_vp8.c
libavformat/rtpenc.c
libavformat/rtpenc.h

Simple merge
Simple merge
Simple merge