Changeset f5c7531 in ffmpeg

Timestamp:

Mar 30, 2015, 6:31:50 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

98263d75

Parents:

0187c2cc (diff), 7d3183d3 (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 '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'

• commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161': qsv: Skip header compilation depending on what parts of qsv are enabled

Conflicts:

libavcodec/Makefile

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

(No files)