Skip to content

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

Merge commit '1bd2646a' 

* commit '1bd2646a':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

Conflicts:
	libavformat/rtpenc_jpeg.c

See: 7f64a750Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f8951d36 1bd2646a
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