Changeset 0d208967 in ffmpeg

Timestamp:

Mar 4, 2015, 12:23:54 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f6f1e2b3

Parents:

b4fbad26 (diff), db5cc75f (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> (03/04/15 00:23:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/04/15 00:23:54)

Message:

Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'

• commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24': wma.h: #include "avcodec.h"

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

(No files)