Changeset d858ee71 in ffmpeg

Timestamp:

May 28, 2014, 10:20:48 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a8499cbb

Parents:

b50559fc (diff), 6d212599 (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 commit '6d212599aa684f30511fb08ca30fe2378405304e'

• commit '6d212599aa684f30511fb08ca30fe2378405304e': avformat: Provide a standard compliance flag

Conflicts:

doc/APIchanges
libavformat/avformat.h
libavformat/version.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)