Skip to content

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

Merge commit '7ebfb466' 

* commit '7ebfb466':
  h264: Don't store intra pcm samples in h->mb
  get_bits: Return pointer to buffer that is the result of the alignment

Conflicts:
	libavcodec/h264_mb_template.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dd373263 7ebfb466
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