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

Merge commit 'f726fc21' 


* commit 'f726fc21':
  ogg: Provide an option to offset the serial number

Conflicts:
	libavformat/oggenc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 021c0c5f f726fc21
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment