1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavformat
Michael Niedermayer 17049bff64 Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'
* commit 'adc09136a4a63b152630abeacb22c56541eacf60':
  xwma: Avoid division by zero

Conflicts:
	libavformat/xwma.c

See: a3cb7f992f88fcfa524bd9cd08b28e09d6718f75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 22:59:49 +02:00
..
2013-09-19 22:04:34 +02:00
2013-08-29 01:57:38 +02:00
2013-09-03 19:34:04 +02:00
2013-09-18 14:10:05 -04:00
2013-09-21 15:36:33 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 15:36:33 +02:00
2013-09-08 12:54:49 +02:00
2013-09-21 15:36:33 +02:00
2013-08-23 20:05:35 +02:00
2013-09-15 22:03:03 -04:00
2013-09-21 15:36:33 +02:00
2013-08-21 05:51:41 +02:00
2013-09-21 15:36:33 +02:00