diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 14:28:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 14:28:19 +0200 |
| commit | ee2a43798c2a8e3f78806da4cfd41d390c39e115 (patch) | |
| tree | 72ddd487952b8014317f8449b9994d85ab74ee83 /libavcodec/dnxhdenc.h | |
| parent | bad101ab8a54dd36d569daef35f8e583500bbf49 (diff) | |
| parent | 676856204b84dfaffe329dce8502e834a0dbdb19 (diff) | |
| download | ffmpeg-streaming-ee2a43798c2a8e3f78806da4cfd41d390c39e115.zip ffmpeg-streaming-ee2a43798c2a8e3f78806da4cfd41d390c39e115.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dnxhdenc.h')
| -rw-r--r-- | libavcodec/dnxhdenc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 52083be..4e96fa5 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -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); |
