1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Files
FFmpeg/libavformat
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
..
2014-06-18 14:55:28 +02:00
2014-06-03 10:58:19 -08:00
2014-05-17 20:13:33 +02:00
2014-06-03 10:58:19 -08:00
2014-05-20 00:00:45 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-05-20 00:00:45 +02:00
2014-06-03 10:58:19 -08:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-14 21:40:59 +02:00
2014-04-22 20:44:31 +02:00
2014-06-18 14:55:28 +02:00
2014-06-03 10:58:19 -08:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2014-04-27 15:14:32 +02:00
2014-04-20 20:56:02 +02:00
2014-06-07 14:43:07 +02:00
2014-04-15 13:51:48 +02:00