Skip to content

F
ffmpeg.wasm-core
Commit 7830c882 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  mpegts: add HEVC registration descriptor

Conflicts:
	libavformat/mpegts.c

See: d0b7d24bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 93cf43ec 9fa75be9
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
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