1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer 7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +02:00
..
aac.h
aacpsdsp_init_arm.c
aacpsdsp_neon.S
ac3dsp_arm.S
ac3dsp_armv6.S ARM: generate position independent code to access data symbols 2012-07-01 11:25:06 +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
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-06-08 23:59:09 +02:00
dsputil_armv6.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_init_arm.c
dsputil_init_armv5te.c
dsputil_init_armv6.c
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-06-19 20:53:27 +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
fmtconvert_init_arm.c
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264cmc_neon.S ARM: use standard syntax for all LDRD/STRD instructions 2012-08-01 10:32:24 +01: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-06-08 23:59:09 +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-06-08 23:59:09 +02:00
jrevdct_arm.S
Makefile vp3: move idct and loop filter pointers to new vp3dsp context 2012-07-18 10:32:19 +01:00
mathops.h
mdct_fixed_neon.S
mdct_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
mpegaudiodsp_fixed_armv6.S
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_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-06-08 23:59:09 +02:00
rv34dsp_init_neon.c
rv34dsp_neon.S
rv40dsp_init_neon.c
rv40dsp_neon.S
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-06-08 23:59:09 +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-07-01 22:43:09 +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