Changeset 6ca0a976 in ffmpeg

Timestamp:

Apr 19, 2014, 4:30:37 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c1bc20bf

Parents:

74a8dbe1 (diff), d23fc884 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/19/14 16:28:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/19/14 16:30:37)

Message:

Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

• commit 'd23fc8846d255e31896453136b4c77bc6d5e873f': filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

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

(No files)