Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Oct 2014 00:51:08 +0000 (02:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Oct 2014 00:51:08 +0000 (02:51 +0200)
commit3726d07a2af8d57f5af57be339c94fe902853e10
treefe9feefe5d0c1c0d9dd5a56ae42cbd96886d567c
parent4db0e8fd3366eadb2d6374b647b8738208749348
parent28816050e47b6dba430a52e429d21a864cffda8e
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>
libavformat/hdsenc.c
libavformat/hlsenc.c
libavformat/mpegtsenc.c
libavformat/segment.c
libavformat/smoothstreamingenc.c