Changeset 817f813 in ffmpeg

Timestamp:

Mar 1, 2014, 1:12:39 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

77c23520

Parents:

11c4bc9a (diff), 03c2a66f (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/01/14 13:10:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/01/14 13:12:39)

Message:

Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'

• commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b': qt-faststart: Fix the signedness of variables keeping the ftello return values

Conflicts:

tools/qt-faststart.c

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

(No files)