[FFmpeg-cvslog] Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec  8 14:58:56 2012 +0100| [57cee850238488a6088085ae078af17f04f2198a] | committer: Michael Niedermayer

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
  parser: fix large overreads
  bitstream: add get_bits64() to support reading more than 32 bits at once
  arm: detect cpu features at runtime on Linux

Conflicts:
	libavcodec/parser.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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