diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-26 22:36:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-26 22:40:02 +0200 |
| commit | 17106a7c90902c7cddc5ad516234bd0e37d27732 (patch) | |
| tree | 674b2b4bf6bba67f441c925511fc1cabe5bda74a /libavutil/x86 | |
| parent | 3a621c9d9929bcad3ae042c4c33308b4544c7cb1 (diff) | |
| parent | d7f9786cbcd3fede7c751f1c1f481e55ee2380bd (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
audio_frame_queue: Clean up ff_af_queue_log_state debug function
dwt: Remove unused code.
cavs: convert cavsdata.h to a .c file
cavs: Move inline functions only used in one file out of the header
cavs: Move data tables used in only one place to that file
fate: Add a single symbol Ut Video decoder test
vf_hqdn3d: x86 asm
vf_hqdn3d: support 16bit colordepth
avconv: prefer user-forced input framerate when choosing output framerate
Conflicts:
ffmpeg.c
libavcodec/audio_frame_queue.c
libavcodec/dwt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d726d1bc28..c1827fbbad 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -159,6 +159,7 @@ CPUNOP amdnop %define r%1w %2w %define r%1b %2b %define r%1h %2h + %define %2q %2 %if %0 == 2 %define r%1m %2d %define r%1mp %2 |