1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 9bacb576bc 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>
2015-02-01 13:22:21 +01:00
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-01-07 17:17:33 -09:00
2015-01-31 12:01:54 +00:00
2014-12-01 00:31:06 +01:00
2015-01-12 09:32:06 -09:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2014-12-06 02:48:17 +01:00
2014-07-17 11:29:01 +02:00