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

Merge commit 'ce423163' 


* commit 'ce423163':
  h264: Always invoke the get_format() callback

Conflicts:
	libavcodec/h264_slice.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 01831fd0 ce423163
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 36 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