Commit 4f32efdf authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c3311d47'

* commit 'c3311d47':
  avienc: sanitize variable naming in write_header()

Conflicts:
	libavformat/avienc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4fac4447 c3311d47
This diff is collapsed.
Markdown is supported
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