merge with FFmpeg/hevc_ext