ffmpeg/libavformat
Michael Niedermayer 304ebed586 mpegts_probe: detect files with garbage at the begin.
Fixes Ticket1811

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 17:22:04 +01:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adtsenc.c
adxdec.c
aea.c
aiff.h
aiffdec.c aiffdec: read ID3 attached pictures 2012-10-26 01:52:40 +02:00
aiffenc.c
allformats.c LVF demuxer 2012-10-22 23:22:39 +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 asfdec: fixed signedness in comparission 2012-10-25 00:35:55 +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-28 14:24:27 +01:00
assenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
au.c
audiointerleave.c lavf/audiointerleave: check return value of av_new_packet() 2012-10-15 17:03:41 +00:00
audiointerleave.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
avc.c
avc.h
avformat.h lavf: const correctness for avformat_new_stream 2012-10-24 17:55:35 +00:00
avi.h
avidec.c avidec: remove unneeded null check 2012-10-19 21:46:39 +02:00
avienc.c lavf/avienc: fix/extend error message, in case of too large number of skipped frames 2012-10-31 14:46:40 +01:00
avio_internal.h avio: redesign ffio_rewind_with_probe_data() 2012-10-13 02:08:59 +02:00
avio.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
avio.h Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' 2012-10-11 14:03:12 +02:00
aviobuf.c avio: detect implicit truncation by assert in avio_w* 2012-10-24 15:42:00 +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
bit.c bit: check av_new_packet() return value 2012-10-26 15:34:25 +00:00
bluray.c
bmv.c Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
c93.c
cache.c cache: check lseek() return 2012-10-18 00:55:03 +02:00
caf.c
caf.h
cafdec.c cafdec: fix parsing of chunks which may have unused data 2012-10-28 20:33:29 +00:00
cafenc.c caf muxer: write metadata 2012-10-26 03:12:45 +00:00
cavsvideodec.c
cdg.c
cdxl.c
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 Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a' 2012-10-30 15:28:24 +01:00
dv.h
dvenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
dxa.c
eacdata.c
electronicarts.c
ffm.h Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 2012-10-17 14:17:55 +02:00
ffmdec.c ffmdec: check av_new_packet() return value 2012-10-17 20:45:59 +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 lavf/flacenc: disallow creation of invalid files with -c copy 2012-10-22 08:07:09 +00:00
flacenc.h
flic.c
flv.h
flvdec.c flvdec: check return value of create_stream() 2012-10-15 15:59:53 +00: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
g722.c Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +02:00
g723_1.c
g729dec.c
gif.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
gopher.c
gsmdec.c
gxf.c Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72' 2012-10-19 13:29:24 +02:00
gxf.h
gxfenc.c gxfenc: fix null ptr dereference 2012-10-19 23:21:41 +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 hls: fix integer overflow 2012-10-19 23:00:47 +02:00
hlsproto.c hlsproto: fix integer overflow 2012-10-19 23:24:03 +02:00
http.c http: add -content_type user option. 2012-10-24 22:15:31 +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 Update my email address 2012-10-27 02:06:21 +02:00
id3v1.c
id3v1.h
id3v2.c parse ID3v2 chapters 2012-10-28 15:10:28 +00:00
id3v2.h
id3v2enc.c
idcin.c idcin: check chunk_size value before using it 2012-10-15 15:48:13 +00:00
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: check return value of av_new_packet() 2012-10-15 14:53:56 +00: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
libavformat.v libavformat.v: export ffurl_protocol_next 2012-09-13 16:21:25 +02:00
libmodplug.c
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
lvfdec.c lvfdec: cosmetics: fix identation 2012-10-25 20:57:40 +00:00
lxfdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
m4vdec.c
Makefile Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +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-10-25 13:15:58 +02:00
matroskaenc.c matroskaenc: avoid implicit truncation in avio_w* 2012-10-24 15:27:01 +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 mmsh: fix integer overflow in mmsh_seek() 2012-10-20 20:13:18 +02:00
mmst.c
mov_chan.c
mov_chan.h
mov.c mov_probe: use correct variable 2012-10-25 00:24:25 +02:00
movenc.c movenc: Add required 'prof' atom to 'tapt' atom set. 2012-10-29 16:45:37 +01: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: remove unused variable 2012-10-29 22:11:21 +01:00
mp3enc.c mp3enc: remove unneeded null ptr check 2012-10-16 20:27:16 +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_probe: detect files with garbage at the begin. 2012-11-01 17:22:04 +01: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 mpegvideo_probe: check slice order 2012-11-01 15:08:03 +01:00
mpjpeg.c
msnwc_tcp.c
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 mxfdec: Fix inferred misuses of enums 2012-11-01 16:21:12 +01:00
mxfenc.c mxfenc: Write MultipleDescriptor ref in Preface 2012-10-25 13:56:24 +02:00
mxg.c
ncdec.c
network.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
network.h Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 2012-10-24 12:53:26 +02:00
nsvdec.c nsvdec: fix division by 0 2012-10-20 20:20:39 +02:00
nullenc.c
nut.c Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
nut.h Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
nutdec.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
nutenc.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
nuv.c
oggdec.c Fix various uses of av_log_missing_feature() 2012-10-21 23:13:53 +02:00
oggdec.h oggdec: add missing () for OGG_NOGRANULE_VALUE 2012-09-25 16:03:55 +02:00
oggenc.c libavformat/oggenc: add {} to complex ifs 2012-10-21 18:05:23 +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 commit '8b8899ac3233b4f7af83ded0dc032fad8902d714' 2012-10-23 15:00:27 +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
options_table.h lavf: Add support offset timestamps on muxing. 2012-09-26 15:55:16 +02:00
options.c
os_support.c Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 2012-10-24 12:53:26 +02:00
os_support.h Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
paf.c paf: avoid C99 overflows 2012-10-14 04:01:41 +02:00
pcm.c
pcm.h
pcmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-26 15:20:48 +02:00
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +02:00
rawdec.h Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +02:00
rawenc.c
rawenc.h
rawvideodec.c Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +02:00
rdt.c
rdt.h
realtextdec.c
riff.c Add an additional AAC TwoCC. 2012-10-28 14:50:11 +01:00
riff.h Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 2012-10-17 14:30:25 +02:00
rl2.c
rm.c
rm.h Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7' 2012-10-16 13:20:46 +02:00
rmdec.c rmdec: fix null derefercne 2012-10-26 16:18:09 +02:00
rmenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rmsipr.c Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7' 2012-10-16 13:20:46 +02:00
rmsipr.h Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7' 2012-10-16 13:20:46 +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
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c
rtmppkt.h Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
rtmpproto.c rtmp_write_amf_data: remove dead code 2012-10-20 22:57:30 +02:00
rtp.c
rtp.h Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 2012-10-19 13:58:14 +02:00
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
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-29 13:15:27 +01: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.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 commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
rtsp.h Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' 2012-10-22 14:39:12 +02:00
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
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 sierravmd: flip reduce arg order. 2012-10-16 20:03:37 +02:00
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 smoothstreamingenc: check return value of mkdir() 2012-10-29 03:34:17 +01:00
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714' 2012-10-23 15:00:27 +02:00
spdifenc.c
srtdec.c srt: make the demuxer output SubRip packets. 2012-10-25 00:09:36 +02:00
srtenc.c lavf/srtenc: add AVFMT_TS_NONSTRICT flag. 2012-10-28 20:45:58 +01:00
subtitles.c
subtitles.h
subviewerdec.c lavf/subviewerdec: fix potential timing overflows. 2012-10-21 01:08:17 +02:00
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: support DefineBitsLossless{,2} tag. 2012-10-17 07:49:17 +02:00
swfenc.c swfenc: zero fifo after freeing 2012-10-27 23:03:07 +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 tta: datalen is unsigned integer per reference library 2012-10-17 11:58:08 +00:00
tty.c
txd.c lavf/txd: cosmetics: fix identation 2012-10-15 08:12:25 +00:00
udp.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
url-test.c Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
url.h
urldecode.c
urldecode.h
utils.c utils: fix rounding of micro seconds 2012-10-31 19:12:47 +01:00
vc1test.c
vc1testenc.c
version.h caf muxer: write metadata 2012-10-26 03:12:45 +00:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wavdec.c Merge remote-tracking branch 'qatar/master' 2012-10-17 15:53:42 +02:00
wavenc.c wavenc: fix curruption of metadata 2012-10-30 21:48:39 +01:00
wc3movie.c
webvttdec.c lavf/webvttdec: fix potential timing overflows. 2012-10-21 01:16:49 +02:00
westwood_aud.c
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c wtvdec: display warning for encrypted wtv files (instead of 'unsupported chunk' messages) 2012-10-23 15:26:57 +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 remote-tracking branch 'qatar/master' 2012-10-28 14:24:27 +01:00