Michael Niedermayer 9943c5a42b Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd' ... * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-11-18 02:46:07 +01:00
..
acodec	…
fate	lavu/opt: introduce av_opt_serialize()	2014-11-16 01:13:38 +01:00
lavf	Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'	2014-11-18 02:46:07 +01:00
lavf-fate	Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'	2014-10-24 15:30:12 +02:00
seek	…
vsynth	dv: more precise weight table for 8x8	2014-10-25 19:01:45 +02:00
vsynth1	…
vsynth2	…