Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
[ffmpeg.git] / libavfilter / lswsutils.c
2012-05-26 Michael Niedermayerlswsutils: fix "ncompatible pointer type" warning
2012-04-07 Stefano Sabatinilavfi: port libmpcodecs remove-logo filter