Changeset 3f965ab in ffmpeg

Timestamp:

Oct 8, 2013, 9:37:22 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

31d9aa6

Parents:

1f17619f (diff), 47f9d7ce (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> (10/08/13 09:37:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/08/13 09:37:22)

Message:

Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'

• commit '47f9d7ce5493e119e09d1227d017414feaaf8d97': x86inc: Check for OUTPUT_FORMAT having a value of "x64"

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

(No files)