Changeset 9ad8f55e in ffmpeg

Timestamp:

Feb 23, 2015, 8:49:51 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8f140a8e

Parents:

83f18410 (diff), cb4cb7b0 (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 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'

• commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41': qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:

libavcodec/Makefile

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

(No files)