Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 20:23:29 +0000 (22:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 20:23:29 +0000 (22:23 +0200)
commit7ad528cf23da5479c7cbf4676d071a07a709d8b6
treed27e00432884105a892daca51561b05b255cf0d7
parentf5c5aa968c3c96ff3968bd5b060e5a0f2f278732
parent06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e
Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'

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

Conflicts:
ffplay.c

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