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

Merge commit 'e10fd08a' 


* commit 'e10fd08a':
  h264: Refactor decode_nal_units

Conflicts:
	libavcodec/h264.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a7a82f2f e10fd08a
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 131 additions and 72 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment