Changeset b882079b in ffmpeg

Timestamp:
Nov 13, 2014, 12:32:08 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
198e55bf
Parents:
ccfae038 (diff), e9a6ae77 (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 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'

Conflicts:

libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.