Changeset c0caf7e8 in ffmpeg

Timestamp:

Nov 21, 2013, 6:09:12 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6a7980e2

Parents:

c8a0a2e (diff), dd249245 (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 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

• commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1': filter docs: reference scale and fps filters

Conflicts:

doc/filters.texi

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

(No files)