Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 20:26:42 +0000 (22:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 20:26:42 +0000 (22:26 +0200)
commit92ef4be4ab9fbb7d901b22e0036a4ca90b00a476
treec04ededf84f089de4f9ef417ca6ecc715b84fa4b
parent2e07f42957666df6d7c63a62263b8447e97b1442
parentd526c5338d50d12a54fd95130030c60070707d3e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegdec.c
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
46 files changed:
cmdutils.c
ffplay.c
libavcodec/alpha/dsputil_alpha.c
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/fft_fixed_init_arm.c
libavcodec/arm/fft_init_arm.c
libavcodec/arm/fmtconvert_init_arm.c
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/mpegvideo_arm.c
libavcodec/arm/vp56dsp_init_arm.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/avcodec.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dv.c
libavcodec/dvdec.c
libavcodec/error_resilience.c
libavcodec/flvdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msmpeg4.c
libavcodec/mxpegdec.c
libavcodec/options_table.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/utils.c
libavcodec/x86/dsputil_mmx.c
libavformat/mov.c
libavutil/cpu.c
libavutil/cpu.h