Skip to content

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

Merge commit 'a3b53ff0' 

* commit 'a3b53ff0':
  mov: Refactor video specific parsing in mov_parse_stsd_video

Conflicts:
	libavformat/mov.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f5a0c205 a3b53ff0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 112 deletions
libavformat/mov.c
View file @ bc6370b6
This diff is collapsed.
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