-
Michael Niedermayer authored
* commit '28f2d3c5 ': cmdutils: Conditionally compile libswscale-related bits Conflicts: cmdutils.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
cdfd61b7
* commit '28f2d3c5 ': cmdutils: Conditionally compile libswscale-related bits Conflicts: cmdutils.c Merged-by:Michael Niedermayer <michaelni@gmx.at>