Skip to content
Snippets Groups Projects
Commit 77aafadc authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'db7f1c7c' 


* commit 'db7f1c7c':
  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: 270cede3
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents de417982 db7f1c7c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 15 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment