Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)
commit32da2fd422651f1f36f26975685cb7f7ff5a678b
tree875a560658191a7a11a660d8c1a3ff0d76799ef1
parent82c742377a168c0a6eb7c34f7c321acdf25036e0
parent1df0b061621b10edde87e3ab7ea83aed381c574f
Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

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

Conflicts:
libavcodec/nuv.c

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