• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · c0e51ec9
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c0e51ec9
jvdec.c 6.78 KB