Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Apr 2011 01:32:26 +0000 (03:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Apr 2011 01:32:26 +0000 (03:32 +0200)
commitc0e51ec9c625ccd7b3a8c74754145e6c023a3848
tree9b8e987ec11d8104cde5269008bb0d21aaac89b7
parent4b9c03b7f08f51fea3c8719f169368a46a0d3b63
parent1f6265e011f6e56562b2f58c182bc0261062b3c4
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>
libavcodec/parser.c
libavformat/applehttpproto.c
libavformat/assdec.c
libavformat/jvdec.c
libavformat/lxfdec.c
libavformat/mmst.c
libavformat/rtpdec_qt.c
libavformat/utils.c
libavformat/wtv.c
libswscale/swscale.h