Michael Niedermayer 57cee85023 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>

2012-12-08 14:58:56 +01:00

..

asm.S

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

bswap.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

cpu.c

arm: rename ARMVFP config symbol to VFP

2012-12-07 16:54:04 +00:00

cpu.h

arm: rename ARMVFP config symbol to VFP

2012-12-07 16:54:04 +00:00

float_dsp_arm.h

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

float_dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-06-22 22:34:02 +02:00

float_dsp_init_neon.c

dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil

2012-11-26 11:29:06 -05:00

float_dsp_init_vfp.c

Merge remote-tracking branch 'qatar/master'

2012-06-22 22:34:02 +02:00

float_dsp_neon.S

dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil

2012-11-26 11:29:06 -05:00

float_dsp_vfp.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

intmath.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

intreadwrite.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

Makefile

arm: rename ARMVFP config symbol to VFP

2012-12-07 16:54:04 +00:00

timer.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00