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)
commitd3b379b95b0da8e4d612a9a1987ba6fd8f2bd8bf
tree116351b9bc5c9e91decd252a81ce4da7d3584f1d
parentf6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b
parent4d012eb541ed7f35e00c87035a470d9f0a24a6e8
Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8'

* 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>
libavformat/oggdec.c
libavformat/xwma.c