Changeset d67d3e29 in ffmpeg

Timestamp:

Nov 14, 2013, 12:49:02 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dbfa4317

Parents:

b71e4d87 (diff), b45c8708 (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> (11/14/13 12:27:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/14/13 12:49:02)

Message:

Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'

• commit 'b45c87083de67969c1598cfef41e7c947b137922': lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump

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

(No files)