Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 12:48:26 +0000 (13:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 12:48:38 +0000 (13:48 +0100)
commit14aa358c20c222b991c56d13b4da536dc84763d3
treeef15962a3abc4f45ac6609f0678c77a0f8ef3336
parent8265c0f43a441f2ec8eb31b6047297d8f18ebcda
parent098eed95bc1a6b2c8ac97f126f62bb74699670cf
Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'

* commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf':
  mdec: merge mdec_common_init() into decode_init().
  eatgv: use fixed-width types where appropriate.
  x86: Simplify some arch conditionals
  bfin: Separate VP3 initialization code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bfin/dsputil_bfin.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/vp3_bfin.c
libavcodec/eatgv.c
libavcodec/mdec.c
libavcodec/vp3dsp.c
libavcodec/vp3dsp.h
libavcodec/x86/h264_qpel.c
libavcodec/x86/idct_sse2_xvid.c