ffmpeg/libavcodec/arm
Michael Niedermayer b25a265a5c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pcm-mpeg: convert to bytestream2 API
  Revert "h264: clear trailing bits in partially parsed NAL units"
  remove iwmmxt optimizations
  mimic: do not continue if swap_buf_size is 0
  mimic: convert to bytestream2 API
  frwu: use MKTAG to check marker instead of AV_RL32
  txd: port to bytestream2 API
  c93: convert to bytestream2 API
  iff: make .long_name more descriptive
  FATE: add test for cdxl demuxer
  rtsp: Fix a typo

Conflicts:
	libavcodec/arm/dsputil_iwmmxt.c
	libavcodec/arm/dsputil_iwmmxt_rnd_template.c
	libavcodec/arm/mpegvideo_iwmmxt.c
	libavcodec/c93.c
	libavcodec/txd.c
	libavutil/arm/cpu.c
	tests/fate/demux.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-13 01:56:33 +01:00
..
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
aac.h
ac3dsp_arm.S
ac3dsp_armv6.S
ac3dsp_init_arm.c
ac3dsp_neon.S
asm-offsets.h
asm.S
dca.h
dcadsp_init_arm.c
dcadsp_neon.S
dsputil_arm.S
dsputil_arm.h Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
dsputil_armv6.S
dsputil_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
dsputil_init_armv5te.c
dsputil_init_armv6.c
dsputil_init_neon.c
dsputil_init_vfp.c
dsputil_neon.S
dsputil_vfp.S
fft_fixed_init_arm.c
fft_fixed_neon.S
fft_init_arm.c
fft_neon.S
fmtconvert_init_arm.c
fmtconvert_neon.S
fmtconvert_vfp.S
h264cmc_neon.S
h264dsp_init_arm.c
h264dsp_neon.S
h264idct_neon.S
h264pred_init_arm.c
h264pred_neon.S
int_neon.S
jrevdct_arm.S
mathops.h
mdct_fixed_neon.S
mdct_neon.S
mpegaudiodsp_fixed_armv6.S
mpegaudiodsp_init_arm.c
mpegvideo_arm.c Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
mpegvideo_arm.h Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
mpegvideo_armv5te.c
mpegvideo_armv5te_s.S
mpegvideo_neon.S
neon.S
rdft_neon.S
rv34dsp_init_neon.c
rv34dsp_neon.S
rv40dsp_init_neon.c
rv40dsp_neon.S
sbrdsp_init_arm.c
sbrdsp_neon.S
simple_idct_arm.S
simple_idct_armv5te.S
simple_idct_armv6.S
simple_idct_neon.S
synth_filter_neon.S
vp3dsp_neon.S
vp8.h
vp8_armv6.S
vp8dsp_armv6.S
vp8dsp_init_arm.c
vp8dsp_neon.S
vp56_arith.h
vp56dsp_init_arm.c
vp56dsp_neon.S