Skip to content

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

Merge commit 'dcbfb780' 

* commit 'dcbfb780':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
	libavformat/utils.c

See: 7bdc5de3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4210cbf1 dcbfb780
Show 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