git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)
commit	32da2fd422651f1f36f26975685cb7f7ff5a678b
tree	875a560658191a7a11a660d8c1a3ff0d76799ef1	tree \| snapshot
parent	82c742377a168c0a6eb7c34f7c321acdf25036e0	commit \| diff
parent	1df0b061621b10edde87e3ab7ea83aed381c574f	commit \| diff

Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

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

Conflicts:
libavcodec/nuv.c

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

Unnamed repository; edit this file 'description' to name the repository.