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

Merge commit 'adf8227c' 


* commit 'adf8227c':
  vc-1: Add platform-specific start code search routine to VC1DSPContext.

Conflicts:
	configure
	libavcodec/arm/vc1dsp_init_arm.c
	libavcodec/vc1dsp.c
	libavcodec/vc1dsp.h

See: 9d8ecdd8
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 77aafadc adf8227c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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