Changeset c0e51ec in ffmpeg

Timestamp:
Apr 7, 2011, 1:32:26 AM (14 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4f299411
Parents:
4b9c03b (diff), 1f6265e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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>

(No files)

Note: See TracChangeset for help on using the changeset viewer.