-
Michael Niedermayer authored
* commit '0f310a6f': rmdec: Validate the fps value Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
f54d751f
* commit '0f310a6f': rmdec: Validate the fps value Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>