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

Merge commit '88c612e3' 


* commit '88c612e3':
  h264: merge the init and reinit paths in update_thread_context()

Conflicts:
	libavcodec/h264_slice.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents cc87493f 88c612e3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 28 additions and 93 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