Skip to content

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

Merge commit '3f0b6d7a' 

* commit '3f0b6d7a':
  wavpack: use bytestream2 in wavpack_decode_block

Conflicts:
	libavcodec/wavpack.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1fded9b6 3f0b6d7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 85 deletions
libavcodec/wavpack.c
View file @ 402bec52
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