-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8bbadc9b) Conflicts: ffmpeg.c
160e91de
Signed-off-by:Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8bbadc9b) Conflicts: ffmpeg.c