diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:08:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:08:28 +0200 |
| commit | 8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa (patch) | |
| tree | d7d3e4e39bab16e8a41ccd308e7cbf658206e5c8 /libavcodec/textdec.c | |
| parent | f0a35623826e367fb1534c68222bfd4918e58a0f (diff) | |
| parent | 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0 (diff) | |
| download | ffmpeg-8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa.tar.gz | |
Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
x86: avcodec: Use convenience macros to check for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/textdec.c')
0 files changed, 0 insertions, 0 deletions