Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 13:58:56 +0000 (14:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 13:58:56 +0000 (14:58 +0100)
commit57cee850238488a6088085ae078af17f04f2198a
tree9551a690983609d59e91e3c63ae4b15114eecb34
parent7efee140d7d6fe197a73a178314eacd330a8cc77
parent096abfa15052977eed93f0b5e01afd2d47c53c1f
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@gmx.at>
configure
libavcodec/get_bits.h
libavcodec/parser.c
libavformat/mpegts.c