Michael Niedermayer 9943c5a42b Merge commit '9257692ac1' ... * commit '9257692ac1': 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	adpcm: Write the proper predictor in trellis mode in IMA QT	2014-06-06 17:08:21 +02:00
fate	lavu/opt: introduce av_opt_serialize()	2014-11-16 01:13:38 +01:00
lavf	Merge commit '9257692ac1'	2014-11-18 02:46:07 +01:00
lavf-fate	Merge commit 'ef363ebd59'	2014-10-24 15:30:12 +02:00
seek	avcodec/asvenc: fix AAN scaling	2014-09-23 17:04:02 +02:00
vsynth	dv: more precise weight table for 8x8	2014-10-25 19:01:45 +02:00
vsynth1
vsynth2