[FFmpeg-cvslog] Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 29 22:59:11 2013 +0200| [17049bff64f27e67e9742193a8e033abf8d1d009] | committer: Michael Niedermayer

Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'

* commit 'adc09136a4a63b152630abeacb22c56541eacf60':
  xwma: Avoid division by zero

Conflicts:
	libavformat/xwma.c

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

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