-
Michael Niedermayer authored
* commit '26a44143': avplay: remove a warning Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5fd254c4
* commit '26a44143': avplay: remove a warning Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>