Skip to content

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

Merge commit '9bd4a9f4' 

* commit '9bd4a9f4':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

See: f6f3c85cMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8e8276e0 9bd4a9f4
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