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)
* 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>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -389,6 -389,6 +389,8 @@@ AVInputFormat *av_probe_input_format3(A
          score = 0;
          if (fmt1->read_probe) {
              score = fmt1->read_probe(&lpd);
++            if(!score && fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions))
++                score = 1;
          } else if (fmt1->extensions) {
              if (av_match_ext(lpd.filename, fmt1->extensions)) {
                  score = 50;
Simple merge
Simple merge