[FFmpeg-cvslog] Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  8 12:34:14 2013 +0100| [3bca69c2a8e70a199d806767624672c4858d091f] | committer: Michael Niedermayer

Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'

* commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3':
  doc: Fix a few typos in the developer documentation
  xwma: Remove unused variable
  asfdec: Fix printf format string length modifier

Conflicts:
	doc/developer.texi

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

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