diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:45:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:46:10 +0200 |
| commit | 77aafadc5655401e5806daed58300a2cccb19fb8 (patch) | |
| tree | 5784ddb1ecdc62045e2db225279365e19f4358a1 /libavcodec/startcode.c | |
| parent | de417982e8977a1dbf05b48c9d0400c500bb5268 (diff) | |
| parent | db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 (diff) | |
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
h264: Move start code search functions into separate source files.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h
See: 270cede3f3772117454a14b620803d731036942d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/startcode.c')
| -rw-r--r-- | libavcodec/startcode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/startcode.c b/libavcodec/startcode.c index 5df7695150..940bbb7107 100644 --- a/libavcodec/startcode.c +++ b/libavcodec/startcode.c @@ -36,19 +36,19 @@ int ff_startcode_find_candidate_c(const uint8_t *buf, int size) * simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE * bytes at the end. */ -# if HAVE_FAST_64BIT +#if HAVE_FAST_64BIT while (i < size && !((~*(const uint64_t *)(buf + i) & (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL)) i += 8; -# else +#else while (i < size && !((~*(const uint32_t *)(buf + i) & (*(const uint32_t *)(buf + i) - 0x01010101U)) & 0x80808080U)) i += 4; -# endif +#endif #endif for (; i < size; i++) if (!buf[i]) |