Skip to content

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

Merge commit '7319a47c' 

* commit '7319a47c':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
	libavformat/mpegtsenc.c

See: e2baaa21Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d76adfae 7319a47c
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