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

4.8 KiB

Raw Blame History

View Raw