Changeset fcb5849 in ffmpeg

Timestamp:

May 15, 2014, 7:01:07 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

91d7d790

Parents:

af31d58a (diff), 5e2ba41d (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 '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

• commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f': build: add avresample after avcodec to FFLIBS

Conflicts:

Makefile

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

(No files)