Changeset 32da2fd4 in ffmpeg

Timestamp:

Mar 22, 2014, 8:58:04 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8fbc6e59

Parents:

82c74237 (diff), 1df0b061 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

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

Conflicts:

libavcodec/nuv.c

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

(No files)