Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Feb 2015 12:22:21 +0000 (13:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Feb 2015 12:22:21 +0000 (13:22 +0100)
commit9bacb576bcdfc86473c04dba8296426fe185ad07
tree2ae86e37e63b46fa181d4ef87549521b957326f5
parent021c0c5f5246351a290c701e7b5c98458ede1b54
parentf726fc21ef76a8ba3445448066f7b2a687fbca16
Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'

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

Conflicts:
libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi
libavformat/oggenc.c