Skip to content
Snippets Groups Projects
Commit 32da2fd4 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '1df0b061' 


* commit '1df0b061':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
	libavcodec/nuv.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 82c74237 1df0b061
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment