1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
ffmpeg/libavformat
Clément Bœsch b08273c9ca lavf/mkv: avoid negative ts by default.
This fixes playback in some circumstances (like webm in firefox).
Regression after 2c34367b.

It is also matching the Matroska specifications:
http://matroska.org/technical/specs/notes.html, "The quick eye will
notice that if a Cluster's Timecode is set to zero, it is possible to
have Blocks with a negative Raw Timecode. Blocks with a negative Raw
Timecode are not valid."
2012-10-15 09:19:21 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c ac3dec: fix uninitialized var warning 2012-08-30 05:17:24 +02:00
act.c
adtsenc.c
adxdec.c
aea.c
aiff.h
aiffdec.c isom: fix redundant redeclaration of ff_mov_read_chan(). 2012-10-02 00:26:15 +02:00
aiffenc.c
allformats.c DTS-HD demuxer 2012-10-09 08:59:09 +00:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
apetagenc.c
asf.c
asf.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
asfenc.c asfenc: avoid negative timestamps 2012-09-28 02:40:53 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
assenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
au.c
audiointerleave.c
audiointerleave.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
avc.c
avc.h
avformat.h lavf: fix fps detection with PAFF H.264 2012-10-14 19:20:23 +02:00
avi.h
avidec.c avoid more "0xFF << 24" as it is considered a integer overflow in C99 2012-10-14 03:34:16 +02:00
avienc.c avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
avio_internal.h avio: redesign ffio_rewind_with_probe_data() 2012-10-13 02:08:59 +02:00
avio.c avio: replace ETIMEDOUT by EIO 2012-09-08 02:28:20 +02:00
avio.h Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' 2012-10-11 14:03:12 +02:00
aviobuf.c avio: redesign ffio_rewind_with_probe_data() 2012-10-13 02:08:59 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c bethsoftvid: check return value of av_packet_new_side_data() 2012-10-11 19:40:27 +00:00
bfi.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
bink.c
bintext.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
bit.c
bluray.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
bmv.c Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
c93.c
cache.c cache: Only include unistd.h if it exists 2012-09-07 19:29:58 +02:00
caf.c
caf.h
cafdec.c Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
concat.c
crcenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
crypto.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c Allow autodetection of some dnxhd files that can be decoded correctly. 2012-10-13 11:59:37 +02:00
dsicin.c
dtsdec.c
dtshddec.c dtshd: fix seeking 2012-10-10 15:50:32 +00:00
dv.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
dv.h
dvenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
dxa.c
eacdata.c
electronicarts.c
ffm.h ffserver: fix seeking with ?date=... 2012-10-08 09:03:19 +02:00
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-07 11:28:38 +02:00
ffmenc.c ffserver: fix seeking with ?date=... 2012-10-08 09:03:19 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
file.c Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
filmstripdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
filmstripenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c flic: use AV_LOG_ERROR for error message 2012-08-31 23:04:05 +02:00
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2012-09-11 15:24:22 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
framecrcenc.c framecrcenc: print flags and side data elements 2012-10-03 16:51:30 +02:00
framehash.c
g723_1.c
g729dec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
gif.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
gopher.c
gsmdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
gxf.c Merge remote-tracking branch 'qatar/master' 2012-10-08 13:11:11 +02:00
gxf.h
gxfenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
h261dec.c
h263dec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
h264dec.c Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
hls.c Fix second use of AVOptions in HLS 2012-10-09 22:12:34 +02:00
hlsproto.c
http.c Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' 2012-10-10 14:07:05 +02:00
http.h
httpauth.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
icodec.c
icoenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
id3v1.c
id3v1.h
id3v2.c id3v2: strdup the genre name explicitly. 2012-09-17 15:48:20 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ilbc.c
img2.c lavc: add xface image decoder and encoder 2012-10-15 08:32:18 +02:00
img2dec.c img2dec: detect .raw files only with a low score as img2 2012-10-10 21:40:03 +02:00
img2enc.c lavc: add xface image decoder and encoder 2012-10-15 08:32:18 +02:00
ingenientdec.c
internal.h mux/nut: factorize ff_choose_timebase() out of nut 2012-10-03 21:34:43 +02:00
ipmovie.c
isom.c Pinnacle TARGA CineWave YUV16 decoder (fourcc Y216). 2012-10-06 06:20:52 +02:00
isom.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libavformat.v libavformat.v: export ffurl_protocol_next 2012-09-13 16:21:25 +02:00
libmodplug.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libnut.c
librtmp.c
lmlm4.c
loasdec.c
log2_tab.c avutil: Duplicate ff_log2_tab instead of sharing it across libs 2012-10-12 20:39:17 +02:00
lxfdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
m4vdec.c
Makefile Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066' 2012-10-13 14:24:58 +02:00
matroska.c Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013' 2012-09-20 19:43:38 +02:00
matroska.h lavf/mkv: prefix video stereo arrays with ff_. 2012-09-16 02:58:40 +02:00
matroskadec.c Merge remote-tracking branch 'qatar/master' 2012-09-21 14:44:32 +02:00
matroskaenc.c lavf/mkv: avoid negative ts by default. 2012-10-15 09:19:21 +02:00
md5enc.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
md5proto.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
mmsh.c
mmst.c
mov_chan.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
mov_chan.h mov_chan: Pass a separate AVIOContext for reading 2012-09-07 10:49:35 +03:00
mov.c mov: fix integer avoption types 2012-10-07 03:20:36 +02:00
movenc.c movenc: fix timescale for timecode track 2012-10-12 20:16:48 +02:00
movenc.h movenc: support an alternative to edit lists to handle the first DTS != 0 case. 2012-10-07 06:04:40 +02:00
movenchint.c
mp3dec.c mp3dec: fix seeking without xing TOC 2012-09-20 22:00:52 +02:00
mp3enc.c mp3enc: fix signed C99 overflow 2012-10-14 05:52:50 +02:00
mpc8.c
mpc.c
mpeg.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpegts.c mpegts: fuzzy crc check for not so spec compliant files 2012-10-08 05:25:27 +02:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
mpegtsenc.c Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' 2012-10-11 14:03:12 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
mtv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mux.c mux: change 1 assert->av_assert1() 2012-10-07 23:31:27 +02:00
mvi.c
mxf.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mxf.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mxfdec.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
mxfenc.c mxfenc: fix av_log data type for dts paramater 2012-10-08 02:08:28 +02:00
mxg.c
ncdec.c
network.c Introduce ff_network_wait_fd_timeout() 2012-10-09 17:17:05 +02:00
network.h Introduce ff_network_wait_fd_timeout() 2012-10-09 17:17:05 +02:00
nsvdec.c nsvdec: change 2 commented assert() to av_assert() 2012-09-18 05:08:32 +02:00
nullenc.c
nut.c Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
nut.h Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
nutdec.c Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
nutenc.c Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f' 2012-10-14 14:31:55 +02:00
nuv.c
oggdec.c Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8' 2012-09-25 16:00:09 +02:00
oggdec.h oggdec: add missing () for OGG_NOGRANULE_VALUE 2012-09-25 16:03:55 +02:00
oggenc.c Merge remote-tracking branch 'qatar/master' 2012-09-28 05:11:19 +02:00
oggparsecelt.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparsedirac.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseflac.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseogm.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseopus.c
oggparseskeleton.c Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
oggparsespeex.c ogg: check that the expected number of headers had been parsed 2012-09-24 22:35:29 +02:00
oggparsetheora.c oggparsetheora: fix comment header parsing 2012-10-05 18:07:13 +02:00
oggparsevorbis.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oma.c
oma.h
omadec.c
omaenc.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
options_table.h lavf: Add support offset timestamps on muxing. 2012-09-26 15:55:16 +02:00
options.c
os_support.c
os_support.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
paf.c paf: avoid C99 overflows 2012-10-14 04:01:41 +02:00
pcm.c
pcm.h
pcmdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
pcmenc.c
pmpdec.c
psxstr.c psxstr: more correct array type. 2012-09-01 23:45:32 +02:00
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
riff.c bitmap header lookup: add code comment 2012-09-23 02:12:34 +02:00
riff.h
rl2.c
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
rmenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rtmp.h
rtmpcrypt.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
rtmppkt.c
rtmppkt.h
rtmpproto.c rtmpproto: Fix an out of array write 2012-10-12 18:16:59 +03:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
rtpdec_ilbc.c
rtpdec_jpeg.c Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
rtpdec_latm.c
rtpdec_mpeg4.c Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
rtpdec_qcelp.c
rtpdec_qdm2.c rtpdec_qdm2: change one assert to av_assert0 2012-10-13 03:32:37 +02:00
rtpdec_qt.c Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 2012-10-13 15:42:49 +02:00
rtpdec_svq3.c
rtpdec_vp8.c Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
rtpdec_xiph.c Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 2012-10-13 15:42:49 +02:00
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
rtpdec.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
rtpenc_xiph.c rtpenc_xiph: switch to av_assert 2012-08-28 22:29:20 +02:00
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
rtpproto.c
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
rtsp.h
rtspcodes.h
rtspdec.c Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
sctp.c
sdp.c sdp: output speex optional vbr parameter 2012-10-13 18:47:18 +02:00
seek-test.c
seek.c
seek.h
segafilm.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
segment.c Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c' 2012-10-11 14:28:18 +02:00
sierravmd.c
siff.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
smacker.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
smjpeg.c
smjpeg.h
smjpegdec.c smjpegdec: use url_feof() 2012-10-13 14:15:58 +00:00
smjpegenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
smoothstreamingenc.c Merge remote-tracking branch 'qatar/master' 2012-10-07 11:28:38 +02:00
smush.c smush: read subversion for version==1 too. 2012-09-09 02:36:57 +02:00
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
srtdec.c
srtenc.c matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 2012-08-31 20:22:49 -07:00
subtitles.c
subtitles.h
subviewerdec.c
swf.c
swf.h lavf/swf: transform the swf tags define in an enum. 2012-10-12 23:15:21 +02:00
swfdec.c lavf/swfdec: return more meaningful error codes. 2012-10-12 23:15:05 +02:00
swfenc.c Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a' 2012-10-10 13:18:05 +02:00
takdec.c takdec: fix seeking 2012-10-10 13:09:26 +00:00
tcp.c tcp: accept params through avio_open2() options 2012-10-09 17:24:55 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
tta.c
tty.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
txd.c
udp.c udp: pick params from AVOptions also 2012-09-15 22:13:21 +02:00
url-test.c Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
url.h Add 'rw_timeout' into URLContext 2012-08-29 00:05:03 +02:00
urldecode.c
urldecode.h
utils.c lavf: fix fps detection with PAFF H.264 2012-10-14 19:20:23 +02:00
vc1test.c
vc1testenc.c
version.h lavc: add xface image decoder and encoder 2012-10-15 08:32:18 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c wav: Fix DTS detection 2012-09-23 01:22:16 +02:00
wc3movie.c
webvttdec.c WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
westwood_aud.c
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c wtvdec: fix memleak on error 2012-10-13 02:37:47 +02:00
wtvenc.c
wv.c wv: do not report invalid stream duration 2012-10-14 10:41:16 +00:00
wvenc.c
xa.c
xmv.c
xwma.c
yop.c yop: check return value of avformat_new_stream() 2012-10-12 14:25:00 +00:00
yuv4mpeg.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00