Skip to content

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

Merge commit 'db71c492' 

* commit 'db71c492':
  mjpegenc: fix argument size in encode_mb

Conflicts:
	libavcodec/mjpegenc.c
	libavcodec/mjpegenc.h

See: 256f5306Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d3127691 db71c492
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