Commit 673a2b38 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1493b237'

* commit '1493b237':
  hevc: Replace nal type chek with equivalent IS_IRAP macro

Conflicts:
	libavcodec/hevc.c

See: e2760de6Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f351afb5 1493b237
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