Changeset 754bf121 in ffmpeg

Timestamp:

Jun 1, 2014, 10:00:20 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ec1ed645

Parents:

181b2c37 (diff), d2ef708c (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> (06/01/14 09:57:43)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/01/14 10:00:20)

Message:

Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'

• commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d': matroskaenc: Allow VP9 and Opus in webm

Conflicts:

libavformat/matroskaenc.c

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

(No files)