[FFmpeg-cvslog] Merge commit '8729698d50739524665090e083d1bfdf28235724'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  8 13:05:02 2013 +0100| [48d30f6733368f317a61901c61a78a10402eea7b] | committer: Michael Niedermayer

Merge commit '8729698d50739524665090e083d1bfdf28235724'

* commit '8729698d50739524665090e083d1bfdf28235724':
  rtsp: Recheck the reordering queue if getting a new packet
  lavr: log channel conversion description for any-to-any functions
  lavr: mix: reduce the mixing matrix when possible
  lavr: cosmetics: reindent

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

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