Changeset 036162a3 in ffmpeg

Timestamp:

Apr 24, 2015, 6:49:45 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9c56cf09

Parents:

10a28e8 (diff), 5bba3ab0 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/24/15 18:49:20)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/24/15 18:49:45)

Message:

Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'

• commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9': internal: Make dlog/tlog a no-op when disabled

Conflicts:

libavcodec/internal.h

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

(No files)