[FFmpeg-cvslog] Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 13:38:57 2013 +0100| [a85311ef841b87ddaacf7c198f422db5c1ac2d60] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a85311ef841b87ddaacf7c198f422db5c1ac2d60
---