Michael Niedermayer 3726d07a2a Merge commit '28816050e47b6dba430a52e429d21a864cffda8e' ...

* commit '28816050e47b6dba430a52e429d21a864cffda8e':
  lavf: Set the stream time base hint properly for chained muxers

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-07 02:51:08 +02:00

51 KiB

Raw Blame History

View Raw