FFmpeg/libavcodec
Michael Niedermayer 80d44190c4 Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'
* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
  kgv1dec: replace forcing EMU_EDGE by a copy

Conflicts:
	libavcodec/kgv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06 14:23:01 +01:00
..
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-15 16:53:32 +01:00
2014-01-01 02:57:56 +01:00
2013-12-22 22:03:47 +01:00
2013-12-28 18:19:46 +01:00
2014-01-06 04:32:37 +01:00
2014-01-02 22:07:09 +01:00
2013-12-29 01:11:16 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-12-31 12:19:59 +01:00
2013-12-31 12:19:59 +01:00
2013-12-31 12:19:59 +01:00
2013-12-18 18:15:15 +01:00
2013-12-18 22:15:32 +01:00
2014-01-04 04:15:22 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2013-12-22 14:59:31 +01:00
2013-12-22 14:59:31 +01:00
2013-12-29 01:11:16 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00