Nicolas George 04bc370072 lavf/avio: do not include bprint.h. ... C++ chokes on the definition of AVBPrint. Including avio.h from c++ code used to work. Fix trac ticket #3800. Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>		2014-07-25 05:37:45 +02:00
..
4xm.c	Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'	2014-05-18 13:10:24 +02:00
a64.c	Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb'	2014-05-18 13:25:18 +02:00
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c	avformat/adtsenc: Optionally enable ID3 in ADTS.	2014-07-22 02:11:25 +02:00
adxdec.c	Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'	2014-07-09 22:38:13 +02:00
aea.c
afc.c
aiff.h
aiffdec.c	Do not limit blocksize when reading PCM from aiff.	2014-06-03 03:07:55 +02:00
aiffenc.c
allformats.c	lavf: Add WebM DASH Manifest Muxer	2014-07-15 23:58:36 +02:00
amr.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
anm.c
apc.c
ape.c
apetag.c
apetag.h
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c	avformat/asfdec: Try to improve skip case	2014-07-14 01:16:08 +02:00
asfenc.c
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
audiointerleave.c	Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'	2014-07-17 14:20:10 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h	avformat: add av_stream_get_parser() to access avformat AVParser	2014-07-14 21:17:20 +02:00
avformatres.rc
avi.h
avidec.c	avformat/avidec: allow rounding errors between scale/rate and timebase	2014-06-04 05:04:13 +02:00
avienc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
avio_internal.h	fix various typos	2014-06-03 10:58:19 -08:00
avio.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
avio.h	lavf/avio: do not include bprint.h.	2014-07-25 05:37:45 +02:00
aviobuf.c	lavf/avio: do not include bprint.h.	2014-07-25 05:37:45 +02:00
avisynth.c	avisynth: set duration of audio streams	2014-05-16 14:41:02 +02:00
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
boadec.c
brstm.c	fix various typos	2014-06-03 10:58:19 -08:00
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c	Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.	2014-05-30 07:26:18 +02:00
cavsvideodec.c	avformat/cavsvideodec: Fix probing when the file extension is avs	2014-06-09 05:17:34 +02:00
cdg.c	avformat/cdg: Do not fail if filesize cannot be determined	2014-07-11 01:04:04 +02:00
cdxl.c
cinedec.c
concat.c
concatdec.c
crcenc.c
crypto.c
cutils.c
data_uri.c
dauddec.c	Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'	2014-07-03 21:42:16 +02:00
daudenc.c	Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'	2014-07-03 21:42:16 +02:00
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c
dtsdec.c
dtshddec.c
dump.c	Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'	2014-06-26 21:03:21 +02:00
dv.c	avformat/dv: implement fallback in dv_extract_pack()	2014-07-17 15:29:27 +02:00
dv.h
dvenc.c	avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps	2014-07-19 20:48:22 +02:00
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h	Remove avserver.	2014-06-18 14:55:28 +02:00
ffmdec.c	Remove avserver.	2014-06-18 14:55:28 +02:00
ffmenc.c	Remove avserver.	2014-06-18 14:55:28 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file_open.c
file.c
filmstripdec.c
filmstripenc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
flac_picture.c
flac_picture.h
flacdec.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
flacenc_header.c	Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'	2014-06-01 14:16:29 +02:00
flacenc.c	Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'	2014-06-01 14:16:29 +02:00
flacenc.h	Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'	2014-06-01 14:16:29 +02:00
flic.c
flv.h
flvdec.c	avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too	2014-07-23 17:41:12 +02:00
flvenc.c	Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'	2014-06-18 01:44:24 +02:00
format.c
framecrcenc.c	avformat/framecrcenc: print the checksum and size of extradata as well	2014-06-15 18:07:03 +02:00
framehash.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
frmdec.c
ftp.c	lavf/ftp: always treat all response codes >= 500 as error	2014-07-04 01:21:08 +02:00
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c
golomb_tab.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hdsenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
hevc.c	fix various typos	2014-06-03 10:58:19 -08:00
hevc.h
hevcdec.c
hls.c
hlsenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
hlsproto.c
hnm.c
http.c	Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'	2014-07-24 02:08:14 +02:00
http.h	Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'	2014-07-22 22:02:48 +02:00
httpauth.c
httpauth.h
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c	Merge commit '9279826008b80daad7446950a821f32033ccd33f'	2014-07-04 00:50:40 +02:00
idcin.c
idroqdec.c
idroqenc.c
iff.c
ilbc.c
img2_alias_pix.c
img2_brender_pix.c
img2.c
img2.h
img2dec.c	Autodetect big-endian tiff files.	2014-07-22 18:09:14 +02:00
img2enc.c
ingenientdec.c
internal.h	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c	Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().	2014-05-21 22:48:11 +02:00
isom.h	Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'	2014-07-01 16:31:57 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c	ivfenc: support VP9	2014-07-03 15:46:26 +02:00
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
libavformat.v
libgme.c
libmodplug.c
libnut.c
libquvi.c
librtmp.c	Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'	2014-07-06 19:12:52 +02:00
libsmbclient.c	lavf: add samba protocol via libsmbclient	2014-07-13 20:38:55 +02:00
libssh.c	lavf/libssh: set freed pointers to NULL	2014-07-12 03:01:38 +02:00
lmlm4.c
loasdec.c
log2_tab.c
lrc.c	AVFormat: LRC demuxer and muxer	2014-07-13 19:18:31 +02:00
lrc.h	AVFormat: LRC demuxer and muxer	2014-07-13 19:18:31 +02:00
lrcdec.c	AVFormat: LRC demuxer and muxer	2014-07-13 19:18:31 +02:00
lrcenc.c	AVFormat: LRC demuxer and muxer	2014-07-13 19:18:31 +02:00
lvfdec.c
lxfdec.c
m4vdec.c	avformat/m4vdec: raise threshold slightly for detection	2014-07-09 17:02:34 +02:00
Makefile	lavf: Add WebM DASH Manifest Muxer	2014-07-15 23:58:36 +02:00
matroska.c
matroska.h	lavf/matroska: Add functions for WebM DASH Manifest	2014-07-15 23:56:17 +02:00
matroskadec.c	avformat/matroskadec: fix declaration after statement	2014-07-16 00:06:15 +02:00
matroskaenc.c	avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit	2014-07-24 20:25:29 +02:00
md5enc.c	avformat/md5enc: add format_version, to allow selecting which version to use	2014-07-16 22:50:24 +02:00
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c
mm.c
mmf.c	avformat/mmf: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:04:20 +02:00
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c	avformat/mov: Pass through iTunSMPB from MOV.	2014-07-22 02:11:48 +02:00
movenc.c	Write valid free atom when -moov_size is specified.	2014-07-18 23:11:11 +02:00
movenc.h	avformat/movenc: dont mark multichannel as mono tracks as containing the center channel	2014-07-14 17:11:11 +02:00
movenchint.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
mp3dec.c	Ignore xing number of frames if the file is larger than indicated.	2014-07-24 15:34:36 +02:00
mp3enc.c	Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'	2014-06-23 03:34:13 +02:00
mpc8.c
mpc.c	avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it	2014-06-15 01:33:17 +02:00
mpeg.c	fix various typos	2014-06-03 10:58:19 -08:00
mpeg.h
mpegenc.c
mpegts.c	Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'	2014-07-22 02:34:12 +02:00
mpegts.h
mpegtsenc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
mpegvideodec.c
mpjpeg.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c	Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'	2014-07-09 23:11:09 +02:00
mux.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h
mxfdec.c
mxfenc.c	avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10	2014-06-27 03:29:51 +02:00
mxg.c
ncdec.c
network.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c	Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'	2014-07-09 23:26:18 +02:00
nullenc.c
nut.c
nut.h	avformat/nutenc: add mode that omits the index	2014-05-29 03:37:37 +02:00
nutdec.c	Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'	2014-07-08 21:18:36 +02:00
nutenc.c	Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'	2014-06-18 17:47:12 +02:00
nuv.c
oggdec.c
oggdec.h	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggenc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
oggparsecelt.c	Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'	2014-07-09 22:48:25 +02:00
oggparsedirac.c
oggparseflac.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseogm.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseopus.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseskeleton.c
oggparsespeex.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsetheora.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsevorbis.c	avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0	2014-06-11 18:12:14 +02:00
oggparsevp8.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oma.c
oma.h
omadec.c
omaenc.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
options_table.h	avformat/options_table: Fix flush_packet flag flags	2014-06-28 21:24:15 +02:00
options.c
os_support.c
os_support.h
paf.c
pcm.c
pcm.h
pcmdec.c	Autodetect Asterisk raw pcm with extension "sln".	2014-05-22 15:15:04 +02:00
pcmenc.c
pjsdec.c
pmpdec.c
psxstr.c
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c
rawdec.c	avformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is found at the file start	2014-06-10 14:42:19 +02:00
rawdec.h	avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flags	2014-06-10 14:20:39 +02:00
rawenc.c	Fix the mime types for MPEG and MPEG-TS formats	2014-05-22 23:34:59 +02:00
rawenc.h
rawvideodec.c
rdt.c	Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87'	2014-05-24 13:21:33 +02:00
rdt.h
realtextdec.c
redspark.c
replaygain.c
replaygain.h
riff.c
riff.h	Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'	2014-06-18 17:47:12 +02:00
riffdec.c
riffenc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
rl2.c
rm.c
rm.h
rmdec.c	Replace av_malloc() and memset(0) by av_mallocz()	2014-06-22 18:43:11 +02:00
rmenc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
rmsipr.c
rmsipr.h
rpl.c
rsd.c
rso.c
rso.h
rsodec.c
rsoenc.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c	Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'	2014-06-01 23:56:22 +02:00
rtmppkt.h	Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'	2014-06-01 23:56:22 +02:00
rtmpproto.c	Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'	2014-06-02 00:32:30 +02:00
rtp.c
rtp.h
rtpdec_amr.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec_ilbc.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec_jpeg.c	Parse dri when receiving jpg via rtp.	2014-07-18 23:11:11 +02:00
rtpdec_latm.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec_mpeg4.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec_mpeg12.c
rtpdec_mpegts.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec.c	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpdec.h	Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'	2014-07-09 23:40:13 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c	Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'	2014-05-31 12:53:46 +02:00
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c	Merge commit '39975acc699c83af0a87a7318c0f41e189142938'	2014-06-28 12:40:01 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c	Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'	2014-06-18 17:27:06 +02:00
rtpenc.h
rtpproto.c
rtpproto.h
rtsp.c	avformat/rtsp: use av_malloc_array()	2014-06-30 05:08:16 +02:00
rtsp.h
rtspcodes.h
rtspdec.c	avformat/rtspdec: Use av_mallocz_array()	2014-05-27 20:42:50 +02:00
rtspenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
samidec.c
sapdec.c
sapenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
sdr2.c
seek-test.c
seek.c	avformat/seek: use av_malloc_array()	2014-07-19 19:44:56 +02:00
seek.h
segafilm.c
segment.c	avformat/segment: re-interleave packets if needed	2014-07-24 23:22:33 +02:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
smush.c
sol.c
sox.h
soxdec.c
soxenc.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
subfile.c
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
swfdec.c
swfenc.c	Merge commit '194be1f43ea391eb986732707435176e579265aa'	2014-06-18 19:49:17 +02:00
takdec.c
tcp.c
tedcaptionsdec.c
tee.c
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c	avformat/udp: fix build on MINIX	2014-06-07 14:43:07 +02:00
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h
urldecode.c
urldecode.h
utils.c	avformat: add av_stream_get_parser() to access avformat AVParser	2014-07-14 21:17:20 +02:00
vc1test.c	Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'	2014-07-06 19:25:12 +02:00
vc1testenc.c
version.h	avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)	2014-07-23 18:42:41 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c	Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'	2014-06-18 17:28:10 +02:00
vorbiscomment.c	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
vorbiscomment.h	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c	avformat/wavdec: add basic sanity check for the sample count	2014-07-14 14:52:18 +02:00
wavenc.c	avformat/wavenc: use av_mallocz_array()	2014-07-11 10:38:45 +00:00
wc3movie.c
webmdashenc.c	lavf: Add WebM DASH Manifest Muxer	2014-07-15 23:58:36 +02:00
webvttdec.c
webvttenc.c	avcodec/webvttenc: add webvtt encoder	2014-05-25 03:04:14 +02:00
westwood_aud.c
westwood_vqa.c
wtv_common.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c	yop: only set extradata size after it has been successfully allocated	2014-05-18 10:22:42 +02:00
yuv4mpeg.h	Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'	2014-05-18 13:37:25 +02:00
yuv4mpegdec.c	Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'	2014-05-18 14:02:31 +02:00
yuv4mpegenc.c	Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'	2014-07-09 23:34:33 +02:00