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>
libavcodec/dnxhdenc.h

index 52083be..4e96fa5 100644 (file)
@@ -89,7 +89,8 @@ typedef struct DNXHDEncContext {
     RCCMPEntry *mb_cmp;
     RCEntry   (*mb_rc)[8160];
 
-    void (*get_pixels_8x4_sym)(int16_t * /*align 16*/, const uint8_t *, ptrdiff_t);
+    void (*get_pixels_8x4_sym)(int16_t * /* align 16 */,
+                               const uint8_t *, ptrdiff_t);
 } DNXHDEncContext;
 
 void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx);