1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavformat
Michael Niedermayer 15ed7ca437 Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'
* commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
  xwma: Do not leak on failure path

Conflicts:
	libavformat/xwma.c

See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 21:30:47 +01:00
..
2014-11-21 17:13:56 +01:00
2014-10-20 10:38:38 +01:00
2014-11-19 11:17:43 +01:00
2014-11-04 14:11:53 +01:00
2014-10-20 10:38:37 +01:00
2014-10-15 20:17:23 +02:00
2014-11-21 17:13:56 +01:00
2014-11-06 09:05:37 +01:00
2014-10-21 03:52:27 +02:00
2014-10-24 09:53:45 +03:00
2014-10-22 23:12:38 +02:00
2014-11-21 17:13:56 +01:00