-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4d02dfbd) Conflicts: ffmpeg.c
e63f330a
Signed-off-by:Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4d02dfbd) Conflicts: ffmpeg.c