Changeset c01bcce4 in ffmpeg

Timestamp:

May 18, 2014, 7:05:46 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1e49439f

Parents:

a6ba5184 (diff), d246231e (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 'd246231e4714119faac6c7acd881d3b687bb8b11'

• commit 'd246231e4714119faac6c7acd881d3b687bb8b11': wavenc: use codec descriptors to get the codec name

Conflicts:

libavformat/wavenc.c

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

(No files)