Changeset ee2a4379 in ffmpeg

Timestamp:

Apr 11, 2014, 12:28:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4899ccd2

Parents:

bad101ab (diff), 67685620 (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 '676856204b84dfaffe329dce8502e834a0dbdb19'

• commit '676856204b84dfaffe329dce8502e834a0dbdb19': DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

Conflicts:

libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc_init.c

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

(No files)