Changeset 8fdec02f in ffmpeg

Timestamp:

Jul 5, 2013, 10:43:57 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

47ca9f04

Parents:

d880b2bd (diff), 0420c810 (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> (07/05/13 10:37:13)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/05/13 10:43:57)

Message:

Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'

• commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d': log: pass the correct parameters to missing_feature_sample

Conflicts:

libavutil/log.c

See: 572e38a513139b21c35acfef13aa7c4e307ab648

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

(No files)