Changeset 7ad528cf in ffmpeg

Timestamp:

Apr 30, 2015, 8:23:29 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

39fbb27e

Parents:

f5c5aa96 (diff), 06f4b1e3 (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.

Message:

Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'

• commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e': avplay: Do not print a possibly uninitialized value

Conflicts:

ffplay.c

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

(No files)