Michael Niedermayer c0e51ec9c6 Merge remote branch 'qatar/master' ...

* qatar/master:
  Fix parser: mark av_parser_parse() for removal on next major bump
  swscale: postpone sws_getContext removal until next major bump.
  fate: add AAC LATM test
  mmst: get rid of deprecated AVERRORs
  lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
  Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code:  lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
	libavformat/utils.c

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

2011-04-07 03:32:26 +02:00

..

bfin

Replace FFmpeg with Libav in licence headers

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

mlib

Replace FFmpeg with Libav in licence headers

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

ppc

Replace FFmpeg with Libav in licence headers

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

sparc

Replace FFmpeg with Libav in licence headers

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

x86

Replace FFmpeg with Libav in licence headers

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

colorspace-test.c

Replace FFmpeg with Libav in licence headers

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

libswscale.v

Add symbol versioning for shared libraries

2010-01-16 04:48:55 +00:00

Makefile

Merge libavcore into libavutil

2011-02-15 16:18:21 +01:00

options.c

Replace FFmpeg with Libav in licence headers

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

rgb2rgb_template.c

Replace FFmpeg with Libav in licence headers

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

rgb2rgb.c

Replace FFmpeg with Libav in licence headers

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

rgb2rgb.h

Replace FFmpeg with Libav in licence headers

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

swscale_internal.h

Fix yuvj420p scaling artefact, issue1108.

2011-04-03 16:40:11 +02:00

swscale_template.c

Fix yuvj420p scaling artefact, issue1108.

2011-04-03 16:40:11 +02:00

swscale-test.c

Replace FFmpeg with Libav in licence headers

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

swscale.c

fix runtime-cpu-detect bug in swscale

2011-04-05 02:36:57 +02:00

swscale.h

Merge remote branch 'qatar/master'

2011-04-07 03:32:26 +02:00

utils.c

libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

2011-03-26 13:24:32 +11:00

yuv2rgb.c

libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

2011-03-26 13:24:32 +11:00