third_party_ffmpeg/libavcodec/arm
Michael Niedermayer b479e01612 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Revert "v210enc: use FFALIGN()"
  doxygen: Do not include license boilerplates in Doxygen comment blocks.
  avplay: reset decoder flush state when seeking
  ape: skip packets with invalid size
  ape: calculate final packet size instead of guessing
  ape: stop reading after the last frame has been read
  ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
  ape: return error if seeking to the current packet fails in ape_read_packet()
  avcodec: Clarify AVFrame member documentation.
  v210dec: check for coded_frame allocation failure
  v210enc: use stride as it is already calculated
  v210enc: use FFALIGN()
  v210enc: return proper AVERROR codes instead of -1
  v210enc: do not set coded_frame->key_frame
  v210enc: check for coded_frame allocation failure
  drawtext: add 'fix_bounds' option on coords fixing
  drawtext: fix text_{w, h} expression vars
  drawtext: add missing braces around an if() block.

Conflicts:
	libavcodec/arm/vp8.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/v210dec.c
	libavfilter/vf_drawtext.c
	libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-07 01:40:29 +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: ac3: fix ac3_bit_alloc_calc_bap_armv6 2012-02-02 18:50:42 +00: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 Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +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
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
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 Merge remote-tracking branch 'qatar/master' 2012-01-21 01:33:31 +01:00
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' 2012-01-29 00:34:59 +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
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: add NEON rv34_idct_add 2012-01-16 19:26:41 +01:00
rv34dsp_neon.S rv34: add NEON rv34_idct_add 2012-01-16 19:26:41 +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
sbrdsp_init_arm.c aacsbr: ARM NEON optimised sbrdsp functions 2012-01-28 14:56:18 +00:00
sbrdsp_neon.S aacsbr: ARM NEON optimised sbrdsp functions 2012-01-28 14:56:18 +00:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +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 remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vp8.h Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vp8dsp_armv6.S VP8: armv6 optimizations. 2011-10-03 01:49:36 +02:00
vp8dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +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