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

Conflicts:
	libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>