OSDN Git Service

Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 10:11:13 +0000 (12:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 10:11:13 +0000 (12:11 +0200)
commit3841f2ae665d527a7c8b3c226925995256adb917
tree62a2f32ee938ff94386dfe6d5771d1d05d40f165
parent64d029de41ed556b765df50c7080b06fd5a86417
parentd35b94fbabd8beb5d566c0b5d01688aff62c3b36
Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
  avcodec: Rename xvidmmx IDCT to xvid

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h
libavcodec/x86/idct_sse2_xvid.c
libavcodec/xvididct.c