Changeset 03acecae in ffmpeg

Timestamp:

Jun 3, 2014, 10:40:11 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3ab4f96a

Parents:

108dec30 (diff), 12d6ae01 (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/03/14 22:40:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/03/14 22:40:11)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Fix fate-aac-ln-encode with --target-path (second try).

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

(No files)