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

Merge commit 'e19d48df' 


* commit 'e19d48df':
  flac muxer: support reading updated extradata from side data

Conflicts:
	libavformat/flacenc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 855e3b57 e19d48df
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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