* 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
Showing the changes to libavcodec/startcode.c (1 of 10 files). Show all
Unified · Split
| @@ -36,19 +36,19 @@ int ff_startcode_find_candidate_c(const uint8_t *buf, int size) · 35 unmodified lines | |||
| 36 | * simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE | 36 | * simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE |
| 37 | * bytes at the end. | 37 | * bytes at the end. |
| 38 | */ | 38 | */ |
| 39 | # if HAVE_FAST_64BIT | 39 | #if HAVE_FAST_64BIT |
| 40 | while (i < size && | 40 | while (i < size && |
| 41 | !((~*(const uint64_t *)(buf + i) & | 41 | !((~*(const uint64_t *)(buf + i) & |
| 42 | (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) & | 42 | (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) & |
| 43 | 0x8080808080808080ULL)) | 43 | 0x8080808080808080ULL)) |
| 44 | i += 8; | 44 | i += 8; |
| 45 | # else | 45 | #else |
| 46 | while (i < size && | 46 | while (i < size && |
| 47 | !((~*(const uint32_t *)(buf + i) & | 47 | !((~*(const uint32_t *)(buf + i) & |
| 48 | (*(const uint32_t *)(buf + i) - 0x01010101U)) & | 48 | (*(const uint32_t *)(buf + i) - 0x01010101U)) & |
| 49 | 0x80808080U)) | 49 | 0x80808080U)) |
| 50 | i += 4; | 50 | i += 4; |
| 51 | # endif | 51 | #endif |
| 52 | #endif | 52 | #endif |
| 53 | for (; i < size; i++) | 53 | for (; i < size; i++) |
| 54 | if (!buf[i]) | 54 | if (!buf[i]) |