Commit 187f4278 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a5354084'

* commit 'a5354084':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
	doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 694f9ab1 a5354084
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