Changeset dbd1fdd2 in ffmpeg

Timestamp:

May 14, 2014, 12:02:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0fdc3cd8

Parents:

6a72260e (diff), 7e90133f (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 '7e90133f6420b1c53652f972b9561600822881ee'

• commit '7e90133f6420b1c53652f972b9561600822881ee': build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:

common.mak

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

(No files)