Skip to content

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

Merge commit 'df507d5a' 

* commit 'df507d5a':
  tiff: Replace deprecated PIX_FMT names by modern ones

Conflicts:
	libavcodec/tiff.c

See: ac627b3dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b7f8d3de df507d5a
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