generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
c4f237a981
ffmpeg/libavcodec/arm
History
Michael Niedermayer 7f83db3124 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (46 commits)
  mtv: Make sure audio_subsegments is not 0
  v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined
  avconv: add symbolic names for -vsync parameters
  flvdec: Fix compiler warning for uninitialized variables
  rtsp: Fix compiler warning for uninitialized variable
  ulti: convert to new bytestream API.
  swscale: Use standard multiple inclusion guards in ppc/ header files.
  Place some START_TIMER invocations in separate blocks.
  v4l2: list available formats
  v4l2: set the proper codec_tag
  v4l2: refactor device_open
  v4l2: simplify away io_method
  v4l2: cosmetics
  v4l2: uniform and format options
  v4l2: do not force interlaced mode
  avio: exit early in fill_buffer without read_packet
  vc1dec: fix invalid memory access for small video dimensions
  rv34: fix invalid memory access for small video dimensions
  rv34: joint coefficient decoding and dequantization
  avplay: Don't call avio_set_interrupt_cb(NULL)
  ...

Conflicts:
	Changelog
	avconv.c
	doc/APIchanges
	doc/indevs.texi
	libavcodec/adxenc.c
	libavcodec/dnxhdenc.c
	libavcodec/h264.c
	libavdevice/v4l2.c
	libavformat/flvdec.c
	libavformat/mtv.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-05 02:03:12 +01: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 arm: Avoid using the movw instruction needlessly 2011-08-03 11:56:58 +03:00
ac3dsp_init_arm.c Merge remote-tracking branch 'mans/ac3' 2011-10-22 11:11:08 +02:00
ac3dsp_neon.S ac3enc: NEON optimised sum_square_butterfly_float 2011-07-06 00:29:59 +01:00
asm-offsets.h Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
asm.S arm: add back ldr_dpren macro that was lost. 2011-12-15 17:24:43 +01:00
dca.h ARM: dca: disable optimised decode_blockcodes() for old gcc 2011-12-15 01:02:58 +00: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 Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
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-11-24 03:32:24 +01:00
dsputil_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
dsputil_init_armv5te.c Merge remote-tracking branch 'qatar/master' 2011-07-21 16:28:53 +02:00
dsputil_init_armv6.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
dsputil_init_neon.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01: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 Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01: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 remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fmtconvert_init_arm.c
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
h264cmc_neon.S rv40: NEON optimised chroma MC 2011-12-06 13:48:25 +00:00
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-12-07 02:04:00 +01:00
h264idct_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
h264pred_init_arm.c h264: 4:2:2 intra decoding support 2011-10-21 01:00:41 -07:00
h264pred_neon.S Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
int_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
jrevdct_arm.S ARM: jrevdct_arm: simplify stack usage 2011-06-13 12:30:22 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-07 02:04:00 +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-11-24 03:32:24 +01: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 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-24 03:07:04 +02:00
mpegvideo_armv5te.c
mpegvideo_iwmmxt.c Merge remote-tracking branch 'qatar/master' 2011-07-16 19:43:35 +02:00
mpegvideo_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
neon.S ARM: make some NEON macros reusable 2011-12-02 19:59:18 +00:00
rdft_neon.S Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
rv34dsp_init_neon.c rv34: joint coefficient decoding and dequantization 2012-01-04 10:30:01 +01:00
rv34dsp_neon.S rv34: joint coefficient decoding and dequantization 2012-01-04 10:30:01 +01:00
rv40dsp_init_neon.c rv40: NEON optimised weak loop filter 2011-12-16 14:36:01 +00:00
rv40dsp_neon.S rv40: NEON optimised weak loop filter 2011-12-16 14:36:01 +00:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01: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 Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
vp8dsp_armv6.S VP8: armv6 optimizations. 2011-10-03 01:49:36 +02:00
vp8dsp_init_arm.c VP8: armv6 optimizations. 2011-10-03 01:49:36 +02:00
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01: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