1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
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
..
asf
ast
au
avi
bmp
caf
dpx
flm
gif
gxf
jpg
mkv
mmf
mov
mpg
mxf
nut
ogg
pam
pcx
pgm
png
ppm
rm
rso
sgi
sox
swf
tga
ts
voc
w64
wav
wtv
xbm
xwd