Changeset aa86cccd in ffmpeg

Timestamp:

Mar 18, 2014, 1:07:24 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

48f7d5f0

Parents:

2daf6be0 (diff), bb97bcec (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> (03/18/14 01:07:20)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/18/14 01:07:24)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

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

(No files)