delta/ffmpeg.git - git.ffmpeg.org: ffmpeg.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '194be1f43ea391eb986732707435176e579265aa'	Michael Niedermayer	2014-06-18	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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>
\| *	lavf: switch to AVStream.time_base as the hint for the muxer timebase	Anton Khirnov	2014-06-18	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* \|	avformat/framehash: switch to AVFMT_FLAG_BITEXACT	Michael Niedermayer	2014-05-18	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	avformat/framehash: add software version to framecrc/md5	Michael Niedermayer	2013-10-23	1	-0/+3
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	Reinstate proper FFmpeg license for all files.	Thilo Borgmann	2013-08-30	1	-4/+4
\|/
*	frame{crc/md5}: set the stream timebase from codec timebase.	Anton Khirnov	2012-02-03	1	-0/+33
	Right now those muxers use the default timebase in all cases(1/90000). This patch avoid unnecessary rescaling and makes the printed timestamps more readable. Also, extend the printed information to include the timebases and packet pts/duration and align the columns. Obviously changes the results of all fate tests which use those two muxers.