1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer eadba3e94d Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f':
  adxdec: use planar sample format
  adpcmdec: use planar sample format for adpcm_thp
  adpcmdec: use planar sample format for adpcm_ea_xas
  adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
  adpcmdec: use planar sample format for adpcm_xa
  adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
  adpcmdec: use planar sample format for adpcm_4xm
  adpcmdec: use planar sample format for adpcm_ima_wav
  adpcmdec: use planar sample format for adpcm_ima_qt
  pcmdec: use planar sample format for pcm_lxf
  mace: use planar sample format
  atrac1: use planar sample format
  build: non-x86: Only compile mpegvideo optimizations when necessary
  rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
  avcodec: free extended_data instead address of it
  fate: Add tests of the ff_make_absolute_url function
  url: Handle relative urls starting with two slashes
  url: Handle relative urls being just a new query string
  url: Don't treat slashes in query parameters as directory separators

Conflicts:
	libavcodec/adxdec.c
	libavcodec/mips/Makefile
	libavcodec/pcm.c
	libavcodec/utils.c
	libavformat/Makefile
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 13:01:27 +02:00
..
aac.h
aacpsdsp_init_arm.c
aacpsdsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_arm.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_armv6.S ARM: swap source operands in some add instructions 2012-09-20 17:07:18 +01:00
ac3dsp_init_arm.c
ac3dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
asm-offsets.h
dca.h arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb 2012-09-16 19:06:11 +02:00
dcadsp_init_arm.c
dcadsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_arm.h
dsputil_arm.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
dsputil_armv6.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
dsputil_init_arm.c
dsputil_init_armv5te.c
dsputil_init_armv6.c dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
dsputil_init_neon.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
dsputil_init_vfp.c Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
dsputil_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fft_fixed_init_arm.c Fix misspellings of FFmpeg 2012-07-19 18:44:46 +02:00
fft_fixed_neon.S Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
fft_init_arm.c
fft_neon.S Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
flacdsp_arm.S Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
flacdsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
fmtconvert_init_arm.c
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264cmc_neon.S Revert "arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4" 2012-09-26 17:31:25 +02:00
h264dsp_init_arm.c arm: fix compile with disable-optimizations on android 2012-08-07 13:31:40 +02:00
h264dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
h264idct_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
h264pred_init_arm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264pred_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
int_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
jrevdct_arm.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
Makefile build: non-x86: Only compile mpegvideo optimizations when necessary 2012-10-09 14:45:59 +02:00
mathops.h
mdct_fixed_neon.S ARM: set Tag_ABI_align_preserved in all asm files 2012-10-02 19:47:56 +01:00
mdct_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
mpegaudiodsp_fixed_armv6.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
mpegaudiodsp_init_arm.c
mpegvideo_arm.c
mpegvideo_arm.h
mpegvideo_armv5te_s.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
mpegvideo_armv5te.c mpegvideo_armv5te: change asserts to av_asserts 2012-10-06 04:45:57 +02:00
mpegvideo_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
neon.S
rdft_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
rv34dsp_init_neon.c
rv34dsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
rv40dsp_init_neon.c
rv40dsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
sbrdsp_init_arm.c
sbrdsp_neon.S ARM: generate position independent code to access data symbols 2012-07-01 11:25:06 +01:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
simple_idct_armv5te.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
simple_idct_armv6.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
simple_idct_neon.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
synth_filter_neon.S Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
vp3dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
vp3dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
vp8_armv6.S Merge remote-tracking branch 'qatar/master' 2012-09-21 14:44:32 +02:00
vp8.h
vp8dsp_armv6.S ARMv6: vp8: fix stack allocation with Apple's assembler 2012-08-04 00:59:14 +01:00
vp8dsp_init_arm.c
vp8dsp_init_armv6.c
vp8dsp_init_neon.c
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp8dsp.h
vp56_arith.h Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
vp56dsp_init_arm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp56dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00