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

Merge commit 'a6cd1544' 


* commit 'a6cd1544':
  h264: move the DPB init/uninit to init_context()/free_context()

Conflicts:
	libavcodec/h264.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e8a46067 a6cd1544
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