Michael Niedermayer
de17ccc774
Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'
* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See: 1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:30:30 +01:00
..
2014-01-09 20:24:15 +01:00
2013-12-05 11:55:41 +01:00
2014-01-20 21:32:47 +01:00
2014-01-20 21:32:47 +01:00
2014-01-20 21:32:47 +01:00
2013-12-05 11:55:41 +01:00
2014-01-06 16:51:23 +01:00
2014-01-06 16:51:23 +01:00
2014-01-09 20:32:53 +01:00
2014-01-23 01:51:24 +01:00
2014-01-25 16:24:50 +01:00
2014-01-20 21:32:47 +01:00
2014-01-14 14:44:59 +01:00
2013-12-20 23:44:31 +01:00
2013-12-02 10:59:48 +01:00
2013-12-20 23:44:31 +01:00
2014-01-14 15:59:00 +01:00
2014-01-09 20:24:15 +01:00
2014-01-09 15:09:07 +01:00
2014-01-31 14:30:30 +01:00
2014-01-30 15:30:01 +01:00
2014-01-09 20:24:15 +01:00
2014-01-09 20:24:15 +01:00
2014-01-30 19:34:13 +01:00
2014-01-24 19:25:25 -05:00
2014-01-30 19:34:13 +01:00
2014-01-18 17:08:25 +01:00