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
..
acodec	…
fate	avcodec/ass: move playres parameters below scripttype	2014-06-18 18:43:36 +02:00
lavf	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
lavf-fate	…
seek	Remove avserver.	2014-06-18 14:55:28 +02:00
vsynth	huffyuv: fate: add a BGR24 test	2014-06-16 00:38:03 +02:00
vsynth1	…
vsynth2	…