Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)
commita85311ef841b87ddaacf7c198f422db5c1ac2d60
tree0c39d27f14ae7168bbc36f57d049a964c6e63a12
parent098d3891be08ca119e20ad7989668ddef83b31ea
parent68f18f03519ae550e25cf12661172641e9f0eaca
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
  videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
  dsputil: drop non-compliant "fast" qpel mc functions
  get_bits: change the failure condition in init_get_bits

Conflicts:
libavcodec/get_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/videodsp_armv5te.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/get_bits.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c