-
Michael Niedermayer authored
* commit 'd450cb07': avplay: Check memory allocation Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
a821617b
* commit 'd450cb07': avplay: Check memory allocation Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>