Changeset 81e3f819 in ffmpeg

Timestamp:

Nov 11, 2014, 7:58:33 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aeb1621d

Parents:

2c0bf76b (diff), 52f954da (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 '52f954da7594c31ad94c9bcb54290145b59b27f5'

• commit '52f954da7594c31ad94c9bcb54290145b59b27f5': libavcodec: Unconditionally build xiph.o

Conflicts:

libavcodec/Makefile

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

(No files)