diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 21:58:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 21:58:04 +0100 |
| commit | 32da2fd422651f1f36f26975685cb7f7ff5a678b (patch) | |
| tree | 875a560658191a7a11a660d8c1a3ff0d76799ef1 /libavcodec/msmpeg4.c | |
| parent | 82c742377a168c0a6eb7c34f7c321acdf25036e0 (diff) | |
| parent | 1df0b061621b10edde87e3ab7ea83aed381c574f (diff) | |
| download | ffmpeg-32da2fd422651f1f36f26975685cb7f7ff5a678b.tar.gz | |
Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
nuv: Reuse the DSPContext from RTJpegContext
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4.c')
0 files changed, 0 insertions, 0 deletions