1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer 3602ad7ee6 Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
	Makefile
	libavcodec/utils.c
	libavformat/avformat.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-11 04:23:25 +02:00
..
aac.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
ac3dsp_arm.S ARM: allow building in Thumb2 mode 2011-06-23 07:31:54 +01:00
ac3dsp_armv6.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
ac3dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-06-02 05:12:10 +02:00
ac3dsp_neon.S ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6 2011-07-02 18:24:41 +01:00
asm-offsets.h
asm.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
dcadsp_init_arm.c
dcadsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
dsputil_arm.h
dsputil_arm.S Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
dsputil_armv6.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
dsputil_init_arm.c
dsputil_init_armv5te.c
dsputil_init_armv6.c
dsputil_init_neon.c Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +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
dsputil_iwmmxt.c
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
dsputil_vfp.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
fft_fixed_init_arm.c
fft_fixed_neon.S Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
fft_init_arm.c
fft_neon.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
fmtconvert_init_arm.c
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
h264dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
h264dsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
h264idct_neon.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
h264pred_init_arm.c
h264pred_neon.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
int_neon.S
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-24 03:07:04 +02:00
mdct_fixed_neon.S
mdct_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
mpegaudiodsp_fixed_armv6.S ARM: allow building in Thumb2 mode 2011-06-23 07:31:54 +01:00
mpegaudiodsp_init_arm.c ARM: optimised mpadsp_apply_window_fixed 2011-06-13 11:33:44 +01:00
mpegvideo_arm.c
mpegvideo_arm.h
mpegvideo_armv5te_s.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
mpegvideo_armv5te.c
mpegvideo_iwmmxt.c
mpegvideo_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
rdft_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
simple_idct_armv5te.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
simple_idct_armv6.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
simple_idct_neon.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
synth_filter_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
vp3dsp_neon.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
vp8_armv6.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
vp8.h
vp8dsp_init_arm.c
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
vp56_arith.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
vp56dsp_init_arm.c
vp56dsp_neon.S