Skip to content

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

Merge commit '5ecabd3c' 

* commit '5ecabd3c':
  msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Conflicts:
	libavcodec/msrledec.c

See: f7e1367fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3ef57029 5ecabd3c
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