Merge commit '190d4a44'
* commit '190d4a44': 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>
Showing
Please
register
or
sign in
to comment