Changeset 6b4cbfec in ffmpeg

Timestamp:

Dec 8, 2014, 8:05:59 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

74622ad3

Parents:

879ea06b (diff), d0b22405 (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> (12/08/14 20:04:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/08/14 20:05:59)

Message:

Merge commit 'd0b224054f13bf57244694a3ff092cfef68d66f9'

• commit 'd0b224054f13bf57244694a3ff092cfef68d66f9': vf_frei0r: do not increment string if it reached the end

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

(No files)