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

Merge commit '9d33bab5' 


* commit '9d33bab5':
  h264: drop H264Context.ouputed_poc

Conflicts:
	libavcodec/h264.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0d5e615c 9d33bab5
No related branches found
No related tags 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