diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 15:22:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 15:28:24 +0100 |
| commit | 6f5f7f705d10e639cf047be216a94de1e39a96e9 (patch) | |
| tree | f80bab61e34b6ad3bf73c165df9e3f7d9d6bdb4e /libavcodec/iff.c | |
| parent | e79c3858b35fcc77c68c33b627958e736686957e (diff) | |
| parent | 08b028c18dc31b6de741861b9555669dcca4d12a (diff) | |
Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
Remove INIT_AVX from x86inc.asm.
Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
dv: fix indentation
Conflicts:
libavformat/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/iff.c')
0 files changed, 0 insertions, 0 deletions