1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer 2b0cdb7364 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Move id3v2 tag writing to a separate file.
  swscale: add missing colons to x86 assembly yuv2planeX.
  g722: split decoder and encoder into separate files
  cosmetics: remove extra spaces before end-of-statement semi-colons
  vorbisdec: check output buffer size before writing output
  wavpack: calculate bpp using av_get_bytes_per_sample()
  ac3enc: Set max value for mode options correctly
  lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
  mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
  mpeg12: move full_pel from MpegEncContext to Mpeg1Context
  mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
  mpegvideo: remove some unused variables from MpegEncContext.

Conflicts:
	libavcodec/mpeg12.c
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24 01:01:21 +02:00
..
aac.h
ac3dsp_arm.S
ac3dsp_armv6.S
ac3dsp_init_arm.c Merge remote-tracking branch 'mans/ac3' 2011-10-22 11:11:08 +02:00
ac3dsp_neon.S
asm-offsets.h Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
asm.S
dca.h dca: ARMv6 optimised decode_blockcode() 2011-10-22 20:28:45 +02:00
dcadsp_init_arm.c
dcadsp_neon.S
dsputil_arm.h
dsputil_arm.S
dsputil_armv6.S
dsputil_init_arm.c
dsputil_init_armv5te.c
dsputil_init_armv6.c
dsputil_init_neon.c
dsputil_init_vfp.c
dsputil_iwmmxt_rnd_template.c
dsputil_iwmmxt.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
h264dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
h264dsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
h264idct_neon.S
h264pred_init_arm.c
h264pred_neon.S
int_neon.S
jrevdct_arm.S
Makefile
mathops.h
mdct_fixed_neon.S
mdct_neon.S
mpegaudiodsp_fixed_armv6.S
mpegaudiodsp_init_arm.c
mpegvideo_arm.c
mpegvideo_arm.h
mpegvideo_armv5te_s.S
mpegvideo_armv5te.c
mpegvideo_iwmmxt.c
mpegvideo_neon.S
rdft_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_armv6.S
vp8.h
vp8dsp_armv6.S
vp8dsp_init_arm.c
vp8dsp_neon.S
vp56_arith.h
vp56dsp_init_arm.c
vp56dsp_neon.S