Changeset 4caf8c5 in ffmpeg

Timestamp:

Sep 12, 2013, 11:38:52 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fcfbc58a

Parents:

a44d35d9 (diff), b26742cc (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> (09/12/13 11:37:20)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/12/13 11:38:52)

Message:

Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'

• commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc': shorten: Break out of loop looking for fmt chunk if none is found

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

(No files)