Michael Niedermayer
ac293b6685
Merge commit '194be1f43ea391eb986732707435176e579265aa'
...
* commit '194be1f43ea391eb986732707435176e579265aa':
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 19:49:17 +02:00
..
2013-08-07 16:20:41 +02:00
2013-08-07 16:20:41 +02:00
2014-05-01 17:40:14 +02:00
2013-08-07 16:20:41 +02:00
2013-08-07 16:20:41 +02:00
2014-05-19 00:05:40 +02:00
2013-04-30 11:53:12 +02:00
2013-08-07 16:20:41 +02:00
2013-06-06 23:57:50 +02:00
2013-08-07 16:20:41 +02:00
2014-06-18 14:55:28 +02:00
2012-11-03 22:47:14 +01:00
2014-06-17 21:38:21 +02:00
2014-04-28 15:20:38 +02:00
2014-06-06 22:54:22 +02:00
2013-08-07 16:20:41 +02:00
2014-03-16 16:26:35 +01:00
2013-04-30 11:53:12 +02:00
2014-06-18 15:12:34 +02:00
2013-08-07 16:20:41 +02:00
2014-05-18 22:57:20 +02:00
2014-04-01 20:52:37 +02:00
2013-08-07 16:20:41 +02:00
2014-06-18 19:49:17 +02:00
2014-06-06 22:54:22 +02:00
2014-05-18 22:57:20 +02:00
2014-05-28 21:51:38 +03:00
2014-03-18 22:15:15 +01:00
2013-04-30 11:53:12 +02:00
2013-07-08 15:21:48 +02:00
2013-07-08 15:21:48 +02:00
2013-07-08 15:21:48 +02:00
2014-03-18 22:15:15 +01:00
2013-04-30 11:53:12 +02:00
2013-08-07 16:20:41 +02:00
2013-08-07 16:20:41 +02:00
2013-04-30 11:53:12 +02:00
2013-08-07 16:20:41 +02:00
2013-08-07 16:20:41 +02:00
2013-04-30 11:53:12 +02:00
2013-04-30 11:53:12 +02:00
2013-04-30 11:53:12 +02:00
2014-06-06 22:54:22 +02:00
2013-08-07 16:20:41 +02:00
2013-08-07 16:20:41 +02:00
2014-04-30 16:41:35 +02:00
2014-04-30 16:41:35 +02:00
2014-06-06 22:54:22 +02:00
2013-07-08 15:21:48 +02:00