1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
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
..
2014-12-18 00:10:35 +01:00
2015-01-05 01:45:49 +01:00
2014-12-09 19:58:56 +01:00
2014-12-18 00:10:35 +01:00
2015-01-15 17:09:39 +01:00
2015-01-05 01:45:49 +01:00
2015-01-14 01:39:16 +01:00
2015-01-30 09:33:49 +00:00
2014-12-18 23:27:07 +01:00
2014-12-18 23:27:07 +01:00
2014-12-02 11:40:01 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2015-01-18 00:36:56 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00
2014-12-18 00:10:35 +01:00