Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 12:28:19 +0000 (14:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 12:28:19 +0000 (14:28 +0200)
* 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>
1  2 
libavcodec/dnxhdenc.h

Simple merge