Changeset d63b032d in ffmpeg

Timestamp:

Mar 4, 2014, 12:26:48 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8cc581fb

Parents:

bfe0320 (diff), 61b323ce (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 '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'

• commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d': vf_frei0r: refactor library loading from env variable

Conflicts:

configure
libavfilter/vf_frei0r.c

Not merged, we use av_strtok() which leads to simpler code

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

(No files)