Michael Niedermayer 2f9d6ffda7 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  id3v2: remove pointless casts
  id3v2: read TXXX frames with two calls to decode_str() instead of one.
  id3v2: don't discard the whole tag when encountering empty frames.
  libvpx: fix build with older libvpx versions.
  ARM: check for inline asm 'y' operand modifier support

Conflicts:
	libavcodec/libvpxenc.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-10-04 03:24:59 +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

arm: Avoid using the movw instruction needlessly

2011-08-03 11:56:58 +03: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

mpeg12enc: add intra_vlc private option.

2011-08-31 13:19:14 +02:00

asm.S

VP8: armv6 optimizations.

2011-10-03 01:49:36 +02:00

dca.h

ARM: check for inline asm 'y' operand modifier support

2011-10-03 08:56:24 +01:00

dcadsp_init_arm.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

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-06-24 03:07:04 +02: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-09-29 01:11:01 +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-tracking branch 'qatar/master'

2011-07-22 12:08:52 +02:00

dsputil_neon.S

Merge remote-tracking branch 'qatar/master'

2011-09-29 01:11:01 +02:00

dsputil_vfp.S

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

fft_fixed_init_arm.c

Merge remote branch 'qatar/master'

2011-04-04 02:15:12 +02:00

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 'newdev/master'

2011-03-21 03:33:28 +01:00

fft_neon.S

Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

2011-07-11 04:23:25 +02:00

fmtconvert_init_arm.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

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

h264: Try to fix 422 intra NEON

2011-08-24 17:57:40 +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

h264: Try to fix 422 intra NEON

2011-08-24 17:57:40 +02:00

h264pred_neon.S

Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

2011-07-11 04:23:25 +02: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

VP8: armv6 optimizations.

2011-10-03 01:49:36 +02:00

mathops.h

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

mdct_fixed_neon.S

ARM: NEON fixed-point forward MDCT

2011-04-03 22:39:52 +01:00

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

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-24 03:07:04 +02:00

mpegvideo_armv5te.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

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

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

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

VP8: armv6 optimizations.

2011-10-03 01:49:36 +02:00

vp56_arith.h

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +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