Commit bd949217 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dcbc748a 190d4a44
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment