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)
commite5a85164b100620fe529bae0ce623956f0bab2e9
tree4732dbaa6666e2448c33a32956b074f51105243d
parentc60d2be5510044edf01d813363e39841db3d751a
parent45a811b512b47acf060247ad0bc7022cada5533b
Merge remote branch 'qatar/master'

* qatar/master:
  mov: fix composition timestamps on movie fragments.
  wmavoice: Use proper size in memeset().
libavcodec/wmavoice.c
libavformat/mov.c