Commit 64235571 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3efe0393'

* commit '3efe0393':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
	libavcodec/hevc.c

See: cc5e4bb4Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bb23a15d 3efe0393
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