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

Merge commit 'e4529df9' 


* commit 'e4529df9':
  flvdec: K&R formatting cosmetics

Conflicts:
	libavformat/flvdec.c

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