ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 18
02:38:38 2014 +0100| [9943c5a42bdf8412f60e8a33489d6f2a8b1b9d61] | committer:
Michael Niedermayer
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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9943c5a42bdf8412f60e8a33489d6f2a8b1b9d61
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
