-
Michael Niedermayer authored
* commit '06f4b1e3': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
7ad528cf
* commit '06f4b1e3': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>