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

Merge commit 'e1f90771' 


* commit 'e1f90771':
  h264: factor out common code from init() and init_thread_copy()

Conflicts:
	libavcodec/h264.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e6c71060 e1f90771
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 40 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