diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 14:29:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 14:30:30 +0100 |
| commit | de17ccc774eab61300b098f2e151cfb9688cdd6d (patch) | |
| tree | 3decdaf452a0d43052bc79a07482a26a01ca376c /libavutil/common.h | |
| parent | a85a718f26ba9078613fe735a2b7d4bafeaa7b65 (diff) | |
| parent | 51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2 (diff) | |
| download | ffmpeg-de17ccc774eab61300b098f2e151cfb9688cdd6d.tar.gz | |
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>
Diffstat (limited to 'libavutil/common.h')
0 files changed, 0 insertions, 0 deletions