Commit bb7be3b7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4d0cd5f5'

* commit '4d0cd5f5':
  flvenc: move metadata updates into a single function

Conflicts:
	libavformat/flvenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c88ae843 4d0cd5f5
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