ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Oct 7 02:51:08 2014 +0200| [3726d07a2af8d57f5af57be339c94fe902853e10] | committer: Michael Niedermayer
Merge commit '28816050e47b6dba430a52e429d21a864cffda8e' * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3726d07a2af8d57f5af57be339c94fe902853e10 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog