Changeset 6a0f9f27 in ffmpeg

Timestamp:

Jun 4, 2014, 6:21:05 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

47313bbb

Parents:

0efe3be (diff), 7738f925 (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/04/14 18:21:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/04/14 18:21:05)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Fix rc_max_rate documentation. Fix some fate filter tests with --target-path.

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

(No files)