Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 01:38:38 +0000 (02:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 01:46:07 +0000 (02:46 +0100)
commit9943c5a42bdf8412f60e8a33489d6f2a8b1b9d61
treea1dd73d724ac6e4e34cb818f9bd3d7b309be347c
parentafbaa9a737b3546c12fdf328016cc1e587d65dc9
parent9257692ac15eff7b07540c1f61cebde0d8823fbd
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>
libavformat/mux.c
libavformat/options.c
tests/ref/lavf/ismv