Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 May 2011 02:14:09 +0000 (04:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 May 2011 02:14:09 +0000 (04:14 +0200)
* qatar/master:
  mov: fix composition timestamps on movie fragments.
  wmavoice: Use proper size in memeset().

1  2 
libavcodec/wmavoice.c
libavformat/mov.c

Simple merge
Simple merge