1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +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
2014-10-25 19:01:45 +02:00
flm
2014-06-17 21:38:21 +02:00
gif
jpg
mmf
mov
mpg
nut
ogg
2014-05-28 21:51:38 +03:00
pam
pcx
pgm
png
ppm
rm
rso
sgi
sox
swf
tga
voc
w64
wav
xbm
xwd