generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'

Browse Source 
* 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: 270cede3f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-05 12:45:30 +02:00
parent de417982e8 db7f1c7c5a
commit 77aafadc56
10 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/startcode.c
View File

@@ -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])