Changeset 6d8dda1 in ffmpeg

Timestamp:

Nov 23, 2014, 12:18:51 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9f0fd17c

Parents:

d899ea20 (diff), eec7f032 (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 'eec7f032a903e06d249d1e8aa6630b65292bf40f'

• commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f': lavf: Remove a redundant include of sys/stat.h

Conflicts:

libavformat/os_support.h

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

(No files)