Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Apr 2011 01:55:42 +0000 (03:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Apr 2011 01:55:48 +0000 (03:55 +0200)
* commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8':
  xwma: Fix wrong printf format expression.
  xwma demuxer: typos
  oggdec: simplify audio chained ogg streams support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/oggdec.c
libavformat/xwma.c

Simple merge
Simple merge