Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 14:22:13 +0000 (15:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 14:28:24 +0000 (15:28 +0100)
commit6f5f7f705d10e639cf047be216a94de1e39a96e9
treef80bab61e34b6ad3bf73c165df9e3f7d9d6bdb4e
parente79c3858b35fcc77c68c33b627958e736686957e
parent08b028c18dc31b6de741861b9555669dcca4d12a
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>
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_intrapred_init.c
libavformat/dv.c