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
..
bmp
2013-04-30 11:53:12 +02:00
2014-10-25 19:01:45 +02:00
flm
2014-06-17 21:38:21 +02:00
gif
2014-04-28 15:20:38 +02:00
jpg
2013-04-30 11:53:12 +02:00
ogg
2014-05-28 21:51:38 +03:00
pam
2014-03-18 22:15:15 +01:00
pcx
2013-04-30 11:53:12 +02:00
png
2014-03-18 22:15:15 +01:00
ppm
2013-04-30 11:53:12 +02:00
sgi
2013-04-30 11:53:12 +02:00
swf
tga
2013-04-30 11:53:12 +02:00
xbm