1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer c4bf740225 Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'
* commit 'c2cb01d418dd18e1cf997c038d37378d773121be':
  lavf: introduce AVFMT_TS_NEGATIVE

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	tests/ref/lavf/asf
	tests/ref/lavf/mkv
	tests/ref/lavf/mpg
	tests/ref/lavf/ts
	tests/ref/seek/lavf-asf
	tests/ref/seek/lavf-mkv
	tests/ref/seek/lavf-mpg
	tests/ref/seek/lavf-ts

This commit does not change the default ts behaviour, such
change will, if its done, be done separately.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 10:59:45 +02:00
..
2013-03-17 04:38:28 +01:00
2013-01-22 20:27:05 +01:00
2013-04-10 12:09:20 +02:00
2013-04-07 03:59:44 +02:00
2013-04-08 14:15:10 +02:00
2013-02-22 13:52:43 +00:00
2013-03-20 20:59:24 +01:00
2013-04-15 12:13:41 +02:00
2013-01-24 15:02:44 +00:00
2013-01-24 15:02:44 +00:00
2013-04-17 00:37:05 +02:00
2013-04-20 00:11:04 +02:00
2013-04-20 00:05:35 +02:00
2013-04-19 14:44:58 +02:00
2013-04-18 00:24:25 +02:00
2013-01-17 04:55:14 +01:00
2013-04-15 01:18:11 +02:00
2013-04-10 12:09:20 +02:00
2013-04-04 04:04:24 +02:00
2013-03-31 16:10:52 +02:00
2013-04-17 02:16:58 +02:00
2013-03-18 23:57:44 +01:00
2013-04-03 13:01:38 +00:00
2013-04-05 14:30:56 +00:00
2013-04-08 20:13:40 +02:00
2013-02-13 17:36:55 +00:00
2013-01-20 20:59:30 +01:00