[FFmpeg-cvslog] Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  1 13:22:21 2015 +0100| [9bacb576bcdfc86473c04dba8296426fe185ad07] | committer: Michael Niedermayer

Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'

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

Conflicts:
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bacb576bcdfc86473c04dba8296426fe185ad07
---