ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
c137fdd778
FFmpeg/libavcodec/arm
History
Michael Niedermayer c137fdd778 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: remove misplaced comment.
  ffmpeg: fix streaming to ffserver.
  swscale: split out RGB48 output functions from yuv2packed[12X]_c().
  build: move vpath directives to main Makefile
  swscale: fix JPEG-range YUV scaling artifacts.
  build: move ALLFFLIBS to a more logical place
  ARM: factor some repetitive code into macros
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  ac3enc: fix allocation of floating point samples.

Conflicts:
	ffmpeg.c
	libavcodec/dsputil_template.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/snow.c
	libswscale/swscale.c
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-15 02:15:25 +02:00
..
aac.h Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
ac3dsp_arm.S ARM: ac3dsp: optimised update_bap_counts() 2011-06-01 15:45:13 +01:00
ac3dsp_armv6.S Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
ac3dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-06-02 05:12:10 +02:00
ac3dsp_neon.S ac3enc: NEON optimised extract_exponents 2011-04-05 01:11:16 +01:00
asm-offsets.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
asm.S Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
dcadsp_init_arm.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dcadsp_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_arm.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
dsputil_arm.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_armv6.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_init_arm.c Merge remote branch 'qatar/master' 2011-05-11 05:47:02 +02:00
dsputil_init_armv5te.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_init_armv6.c Merge remote branch 'qatar/master' 2011-05-11 05:47:02 +02:00
dsputil_init_neon.c Merge remote branch 'qatar/master' 2011-05-11 05:47:02 +02:00
dsputil_init_vfp.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
dsputil_iwmmxt_rnd_template.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_iwmmxt.c Merge remote branch 'qatar/master' 2011-05-11 05:47:02 +02:00
dsputil_neon.S Merge remote-tracking branch 'newdev/master' 2011-03-25 02:57:41 +01:00
dsputil_vfp.S Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
fft_fixed_init_arm.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
fft_fixed_neon.S Fix compilation.for iOS ARMv7. 2011-04-19 10:16:07 +02:00
fft_init_arm.c Merge remote-tracking branch 'newdev/master' 2011-03-21 03:33:28 +01:00
fft_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fmtconvert_init_arm.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fmtconvert_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
h264dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
h264dsp_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264idct_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264pred_init_arm.c Merge remote branch 'qatar/master' 2011-05-11 05:47:02 +02:00
h264pred_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
int_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
jrevdct_arm.S ARM: jrevdct_arm: simplify stack usage 2011-06-13 12:30:22 +01:00
Makefile ARM: optimised mpadsp_apply_window_fixed 2011-06-13 11:33:44 +01:00
mathops.h Merge remote-tracking branch 'qatar/master' 2011-06-07 03:37:57 +02:00
mdct_fixed_neon.S ARM: NEON fixed-point forward MDCT 2011-04-03 22:39:52 +01:00
mdct_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegaudiodsp_fixed_armv6.S ARM: optimised mpadsp_apply_window_fixed 2011-06-13 11:33:44 +01:00
mpegaudiodsp_init_arm.c ARM: optimised mpadsp_apply_window_fixed 2011-06-13 11:33:44 +01:00
mpegvideo_arm.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_arm.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
mpegvideo_armv5te_s.S Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
mpegvideo_armv5te.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_iwmmxt.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rdft_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
simple_idct_arm.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
simple_idct_armv5te.S Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
simple_idct_armv6.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
simple_idct_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
synth_filter_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp3dsp_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp8_armv6.S Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
vp8.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
vp8dsp_init_arm.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp8dsp_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp56_arith.h Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
vp56dsp_init_arm.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp56dsp_neon.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00