1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer a2aeaff40f Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'
* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
	libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 23:41:19 +01:00
..
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-01-06 17:59:27 +01:00
2013-01-06 17:59:27 +01:00
2013-01-06 17:59:27 +01:00
2013-01-06 17:59:27 +01:00
2012-12-21 00:18:34 +01:00
2012-12-24 04:35:12 +01:00
2012-12-31 19:11:12 +01:00
2012-12-21 00:18:34 +01:00
2013-01-04 04:49:16 +01:00
2013-01-06 17:59:27 +01:00
2012-12-31 00:41:35 +01:00
2012-12-21 00:18:34 +01:00
2013-01-04 17:06:29 +01:00
2012-12-18 01:58:17 +01:00
2013-01-02 03:56:57 +01:00
2012-12-29 18:05:49 +01:00
2012-12-29 18:05:49 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 01:56:53 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 17:59:27 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-21 00:18:34 +01:00