[FFmpeg-cvslog] Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 21:58:04 2014 +0100| [32da2fd422651f1f36f26975685cb7f7ff5a678b] | committer: Michael Niedermayer

Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

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

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32da2fd422651f1f36f26975685cb7f7ff5a678b
---