« Previous | Next » 

Revision c0e51ec9

IDc0e51ec9c625ccd7b3a8c74754145e6c023a3848
Parent 4b9c03b7, 1f6265e0
Child 4f299411

Added by Michael Niedermayer over 9 years ago

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 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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted