diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:08:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:08:00 +0200 |
| commit | 69d2eff5af67e9bc461f64dfd3014009f5c851b2 (patch) | |
| tree | fd67c1bdca403cac385230040020ea72ae854ed8 /libavcodec/dirac.h | |
| parent | 2f9ef60c97657e5fa47d5f17c5e4714efb672e4e (diff) | |
| parent | 63bac48f734fc69cca2ef2cfada92cd9a222734d (diff) | |
| download | ffmpeg-69d2eff5af67e9bc461f64dfd3014009f5c851b2.tar.gz | |
Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'
* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
x86: dsputil: Move rv40-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dirac.h')
0 files changed, 0 insertions, 0 deletions