* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c': avcodec: Suppress deprecation warnings from avcodec_alloc_frame() Conflicts: libavcodec/utils.c No change as we dont call this deprecated function Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/43/merge
commit
bd9492174d