MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ffmpeg/libavformat
History
Michael Niedermayer 3f2f87cd5a Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47' 
* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2014-06-18 01:44:24 +02:00
..
4xm.c Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977' 2014-05-18 13:10:24 +02:00
Makefile Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb' 2014-06-16 12:48:03 +02:00
a64.c Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb' 2014-05-18 13:25:18 +02:00
aacdec.c Merge remote-tracking branch 'qatar/master' 2014-03-16 22:38:05 +01:00
ac3dec.c avformat/ac3dec: Use avpriv_ac3_parse_header2() 2014-03-01 01:56:25 +01:00
act.c cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
adp.c Do not detect "00000000..." (and other non-changing values) as adp. 2013-12-09 13:51:00 +01:00
adtsenc.c lavf/adtsenc: Add support for APE tags 2013-10-23 16:13:23 +02:00
adxdec.c avformat/adxdec: use ff_get_extradata() 2013-12-25 17:14:32 +01:00
aea.c
…
afc.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
aiff.h Fix decoding of G.726 in AIFF. 2013-10-18 19:53:47 +02:00
aiffdec.c Do not limit blocksize when reading PCM from aiff. 2014-06-03 03:07:55 +02:00
aiffenc.c lavf/id3v2enc: use metadata_header_padding 2014-01-24 22:50:06 +01:00
allformats.c avformat/flvdec: Support live flv / NGINX RTMP streams 2014-06-16 23:43:11 +02:00
amr.c Improve amr bitrate calculation for VBR files. 2014-04-11 23:38:53 +02:00
anm.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
apc.c avformat/apc: use ff_get_extradata() 2013-12-25 17:14:32 +01:00
ape.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
apetag.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
apetag.h Merge commit '2d2d6a4883479403798f4ed46941d5b365823570' 2013-05-29 10:40:42 +02:00
aqtitledec.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
asf.c Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743' 2013-09-20 11:18:20 +02:00
asf.h Move GUID-related objects to riffenc.c and riff.c. 2014-01-29 00:44:59 +01:00
asfcrypt.c Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 2013-02-06 14:25:28 +01:00
asfcrypt.h
…
asfdec.c avformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames 2014-06-03 15:23:30 +02:00
asfenc.c avformat/asfenc: honor the maximum of 63 payloads 2014-05-13 00:54:55 +02:00
assdec.c Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2' 2014-03-02 21:44:44 +01:00
assenc.c Merge commit '73084391588b0f150737990038829cac5013dd68' 2013-09-17 12:16:55 +02:00
ast.c
…
ast.h
…
astdec.c avformat/astdec: increase the score for odd samplerate/channels to max/8 2013-11-10 13:37:06 +01:00
astenc.c avformat/astenc: avoid using AVCodecContext.frame_number 2014-05-05 16:46:47 +02:00
au.c avformat/au: add assert to help source code analyzers 2013-10-20 14:46:36 +02:00
audiointerleave.c lavf/audiointerleave: return more meaningful error codes 2014-05-20 00:00:45 +02:00
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h Allow values >31bit for -analyzeduration. 2014-06-10 14:28:34 +02:00
avformatres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
avi.h
…
avidec.c avformat/avidec: allow rounding errors between scale/rate and timebase 2014-06-04 05:04:13 +02:00
avienc.c Refuse to mux H.264 with fourcc H264 into avi without startcode. 2014-05-23 16:20:22 +02:00
avio.c lavf: Use av_gettime_relative() 2014-05-17 20:13:33 +02:00
avio.h libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback 2014-03-26 23:58:48 +01:00
avio_internal.h fix various typos 2014-06-03 10:58:19 -08:00
aviobuf.c avformat/aviobuf/ff_get_line: also accept \r as end of line character 2014-05-17 23:49:05 +02:00
avisynth.c avisynth: set duration of audio streams 2014-05-16 14:41:02 +02:00
avlanguage.c
…
avlanguage.h
…
avr.c avformat/avr: check channels and bps in probe 2013-11-11 14:51:43 +01:00
avs.c Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f' 2013-05-05 12:41:36 +02:00
bethsoftvid.c avformat/bethsoftvid: check 4th header byte in probe 2013-11-11 17:50:51 +01:00
bfi.c Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269' 2013-09-30 00:13:36 +02:00
bink.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
bintext.c avformat/bintext: protect against potential overflow of chars_per_frame 2013-10-21 23:37:49 +02:00
bit.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
bluray.c
…
bmv.c bmv: Remove unused variable 2013-10-06 19:36:53 +02:00
boadec.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
brstm.c fix various typos 2014-06-03 10:58:19 -08:00
c93.c
…
cache.c
…
caf.c
…
caf.h
…
cafdec.c avformat: revert %c changes from d92024f18f 2014-03-12 05:09:28 +01:00
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
…
cdxl.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
cinedec.c avformat/cinedec: ask for sample when biBitCount isnt supported 2014-04-06 00:34:09 +02:00
concat.c Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a' 2013-09-27 11:45:37 +02:00
concatdec.c lavf/concatdec: implement automatic conversions. 2014-04-29 13:25:59 +02:00
crcenc.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
crypto.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
cutils.c
…
data_uri.c lavf: add data: URI scheme. 2013-01-01 19:29:04 +01:00
daud.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
dfa.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
diracdec.c avformat/diracdec: check 2 chunks in probe 2013-11-10 16:06:16 +01:00
dnxhddec.c
…
dsfdec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
dsicin.c Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e' 2013-09-12 11:19:38 +02:00
dtsdec.c avformat/dtsdec: Improve probe, reject things looking like analoge signals 2013-07-26 11:19:43 +02:00
dtshddec.c
…
dump.c Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2' 2014-06-16 12:54:36 +02:00
dv.c Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4' 2014-06-12 20:25:48 +02:00
dv.h
…
dvenc.c lavf/dvenc: use av_fifo_alloc_array 2014-05-20 00:00:45 +02:00
dxa.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
eacdata.c eacdata: do not set sample_fmt 2013-01-24 15:02:44 +00:00
electronicarts.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
epafdec.c lavc & lavf: replace deprecated av_log* functions 2013-03-15 18:10:28 +00:00
ffm.h
…
ffmdec.c fix various typos 2014-06-03 10:58:19 -08:00
ffmenc.c Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be' 2013-04-26 10:59:45 +02:00
ffmeta.h
…
ffmetadec.c avformat/ffmetadec: return meaningful error codes 2013-09-11 11:06:44 +00:00
ffmetaenc.c
…
file.c lavf/file: fix help message first character casing for trunc option 2014-01-05 00:51:38 +01:00
file_open.c libavutil: Make avpriv_open a library-internal function on msvcrt 2013-08-10 00:53:33 +03:00
filmstripdec.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
filmstripenc.c
…
flac_picture.c avformat/flac_picture: clear padding area 2014-01-31 17:32:32 +01:00
flac_picture.h Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8' 2013-10-13 09:37:21 +02:00
flacdec.c Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' 2014-05-28 13:02:19 +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
flacenc_header.c Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52' 2014-06-01 14:16:29 +02:00
flic.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
flv.h
…
flvdec.c avformat/flvdec: Support live flv / NGINX RTMP streams 2014-06-16 23:43:11 +02:00
flvenc.c Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47' 2014-06-18 01:44:24 +02:00
format.c avformat/format: av_register_output_format() and av_register_intput_format() that work in O(1) time 2013-12-17 01:07:43 +01:00
framecrcenc.c avformat/framecrcenc: print the checksum and size of extradata as well 2014-06-15 18:07:03 +02:00
framehash.c avformat/framehash: switch to AVFMT_FLAG_BITEXACT 2014-05-18 04:04:32 +02:00
frmdec.c frmdec: do not abuse ff_codec_get_id() 2013-01-12 14:39:13 +00:00
ftp.c lavf/ftp: favour EPSV over PASV command 2014-05-20 00:00:45 +02:00
g722.c
…
g723_1.c Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43' 2013-05-06 10:19:56 +02:00
g729dec.c
…
gif.c Force gif aspect ratio multiplication to 64bit. 2014-04-05 01:13:47 +02:00
gifdec.c avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust 2013-10-04 23:26:40 +02:00
golomb_tab.c avformat: fix hevcs use of golomb from avformat 2014-03-09 22:59:46 +01:00
gopher.c
…
gsmdec.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
gxf.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
gxf.h
…
gxfenc.c avformat/gxfenc: dont use a int intermediate to store in a unsigned int table 2013-12-21 13:52:10 +01:00
h261dec.c avformat/h261dec: dont accept invalid gobs in probe as valid 2013-11-09 01:12:10 +01:00
h263dec.c avformat/h263dec/h263_probe: Check TR 2014-05-07 03:42:21 +02:00
h264dec.c Merge remote-tracking branch 'qatar/master' 2013-09-21 11:57:19 +02:00
hdsenc.c avformat/hdsenc: check mkdir() return code 2014-01-31 03:08:49 +01:00
hevc.c fix various typos 2014-06-03 10:58:19 -08:00
hevc.h Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b' 2014-03-10 23:38:01 +01:00
hevcdec.c Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99' 2013-11-01 17:33:05 +01:00
hls.c avformat/hls: reduce memory usage by using dynamically allocated url/key 2014-04-12 03:14:52 +03:00
hlsenc.c Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7' 2014-05-17 03:13:05 +02:00
hlsproto.c Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6' 2013-07-30 10:19:20 +02:00
hnm.c avformat/hnm: fix decoding of 256x256 video 2014-04-16 01:37:38 +02:00
http.c avformat/http: remove never twice executable loop 2014-05-14 20:44:15 +02:00
http.h
…
httpauth.c avformat/httpauth: add comment about "" and algorithm 2014-03-03 17:04:57 +01:00
httpauth.h
…
icodec.c avformat/ico: use avmalloc(z)_array() 2014-04-16 19:41:41 +02:00
icoenc.c avformat/ico: use avmalloc(z)_array() 2014-04-16 19:41:41 +02:00
id3v1.c Add a comment about an intentional misspelling to the id3v1 tags. 2013-01-04 10:32:39 +01:00
id3v1.h
…
id3v2.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
id3v2.h ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
id3v2enc.c lavf/id3v2enc: update comment about minimum padding 2014-01-24 22:52:33 +01:00
idcin.c avformat/idcin: use ff_get_extradata() 2013-12-25 17:38:29 +01:00
idroqdec.c Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230' 2013-09-19 13:34:25 +02:00
idroqenc.c RoQ encoder: support different integer framerates 2014-02-03 02:04:38 +01:00
iff.c avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks 2014-04-20 00:22:20 +02:00
ilbc.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
img2.c OpenEXR decoder 2014-04-01 01:13:09 +02:00
img2.h avformat/img2dec: make image2dec capable to be used from seperate demuxers 2014-03-28 23:54:51 +01:00
img2_alias_pix.c avformat/img2_alias_pix: fix 2 unused variable warnings 2014-04-29 18:47:27 +02:00
img2_brender_pix.c avformat: add image2 brender pix demuxer 2014-03-28 23:54:51 +01:00
img2dec.c avformat/img2dec: fix typo 2014-04-14 21:40:59 +02:00
img2enc.c Allow .y as extension for image2. 2014-04-05 02:18:09 +02:00
ingenientdec.c
…
internal.h Various small spelling fixes. 2014-04-22 20:44:31 +02:00
ipmovie.c avformat/ipmovie: Check palette size in OPCODE_SET_PALETTE 2013-12-18 23:46:37 +01:00
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 Read mov files where the moov atom is hidden within a free atom. 2014-05-31 16:57:27 +02:00
iss.c avformat/iss: check sscanf() return code 2013-12-23 16:28:44 +01:00
iv8.c
…
ivfdec.c
…
ivfenc.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
jacosubdec.c avformat/jacosubdec: make probing less tolerant. 2013-11-19 12:53:20 +01:00
jacosubenc.c
…
jvdec.c Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b' 2014-02-14 01:51:17 +01:00
latmenc.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavformat.v dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway. 2013-02-15 00:08:12 +01:00
libgme.c avformat/libgme: decrease score by 1, fixes probetest failure 2013-11-06 11:57:48 +01:00
libmodplug.c Fix modplug linkage on Windows. 2014-03-11 13:22:49 +01:00
libnut.c avformat/libnut: use av_mallocz_array() 2014-05-15 01:56:52 +02:00
libquvi.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
librtmp.c Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb' 2014-04-30 21:43:56 +02:00
libssh.c lavf/libssh: fix seek to nagative position 2014-02-28 00:04:29 +01:00
lmlm4.c lmlm4: check packet_size against lower limit too 2013-03-19 16:30:44 +01:00
loasdec.c Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5' 2014-05-04 00:19:35 +02:00
log2_tab.c
…
lvfdec.c avformat/lvfdec: increase the score for odd channels to max/8 2013-11-10 13:36:59 +01:00
lxfdec.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
m4vdec.c Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af' 2013-05-05 12:31:03 +02:00
matroska.c Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870' 2014-05-01 16:03:30 +02:00
matroska.h matroskadec: read the CodecDelay element 2014-04-30 21:00:01 +02:00
matroskadec.c avformat/matroskadec: fix off by 1 error in matroska_read_seek() 2014-05-30 13:55:03 +02:00
matroskaenc.c lavf/matroskaenc: Fix Cues on Audio for WebM DASH 2014-06-06 21:36:11 +02:00
md5enc.c avformat/md5enc: add format, version and column headers 2013-10-26 12:16:04 +02:00
md5proto.c
…
metadata.c avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely 2014-01-17 23:09:52 +01:00
metadata.h
…
mgsts.c
…
microdvddec.c avformat/microdvd: export the declared frame rate 2014-03-03 23:33:47 +01:00
microdvdenc.c lavf: remove some flushing in write_packet muxers callbacks. 2013-04-14 21:16:53 +02:00
mkvtimestamp_v2.c lavf: remove some flushing in write_packet muxers callbacks. 2013-04-14 21:16:53 +02:00
mlvdec.c avformat/mlvdec: close any additional .Mxx files 2014-04-27 15:34:27 +02:00
mm.c Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af' 2013-05-05 12:31:03 +02:00
mmf.c avformat/mmf: switch to AVFMT_FLAG_BITEXACT 2014-05-18 04:04:20 +02:00
mms.c Merge remote-tracking branch 'qatar/master' 2013-12-26 13:24:43 +01:00
mms.h
…
mmsh.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
mmst.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
mov.c avformat/mov: fix "warning: variable altitude set but not used" warning 2014-06-06 15:46:03 +02:00
mov_chan.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
mov_chan.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
movenc.c avformat/movenc: use av_malloc(z)_array() 2014-06-08 15:26:03 +02:00
movenc.h Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1' 2014-05-18 22:29:27 +02:00
movenchint.c Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db036628e11a5171134ebe320b187ee6d6" 2014-05-31 12:54:00 +02:00
mp3dec.c avformat/mp3dec: check the number of frames per buffer size 2014-05-12 21:05:47 +02:00
mp3enc.c Fix the mime types for MPEG and MPEG-TS formats 2014-05-22 23:34:59 +02:00
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
mpc8.c avformat/mpc8: check avio_read() return in mpc8_parse_seektable() 2013-12-26 00:11:49 +01:00
mpeg.c fix various typos 2014-06-03 10:58:19 -08:00
mpeg.h lavf/mpeg.h: Remove an unused definition. 2014-04-27 14:54:29 +02:00
mpegenc.c lavf: use av_fifo_freep 2014-05-07 23:39:47 +02:00
mpegts.c lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown. 2014-06-09 23:20:14 +02:00
mpegts.h avformat/mpegtsenc: Allow DTS audio copy to TS streams 2014-04-27 14:24:29 +02:00
mpegtsenc.c Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd' 2014-06-10 23:55:57 +02:00
mpegvideodec.c avformat/mpegvideodec: check seq headers more completely during probing 2013-11-07 20:39:08 +01:00
mpjpeg.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
mpl2dec.c avformat/subtitles: add a next line jumper and use it. 2013-09-08 18:48:09 +02:00
mpsubdec.c avformat/subtitles: add a next line jumper and use it. 2013-09-08 18:48:09 +02:00
msnwc_tcp.c
…
mtv.c libavformat/mtv: add test for audio magic 2014-02-01 21:09:14 -08:00
mux.c avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet() 2014-06-02 14:48:22 +02:00
mvdec.c Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 2014-04-19 20:17:33 +02:00
mvi.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
mxf.c Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b' 2014-03-19 20:39:05 +01:00
mxf.h Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5' 2014-03-19 20:54:35 +01:00
mxfdec.c Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b' 2014-04-04 02:18:32 +02:00
mxfenc.c Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
mxg.c Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' 2013-08-03 10:08:30 +02:00
ncdec.c
…
network.c lavf: Use av_gettime_relative() 2014-05-17 20:13:33 +02:00
network.h Merge remote-tracking branch 'qatar/master' 2014-01-07 13:16:55 +01:00
nistspheredec.c avformat/nistspheredec: initialize header_size to -1 2013-12-20 18:08:58 +01:00
noproxy-test.c Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c' 2013-06-16 23:45:42 +02:00
nsvdec.c Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 2013-06-03 11:53:05 +02:00
nullenc.c avformat/nullenc: mark null as VFPS 2013-11-13 22:56:18 +01:00
nut.c avformat/nut: support storing RFC 3389 comfort noise 2014-05-01 02:13:31 +02:00
nut.h avformat/nutenc: add mode that omits the index 2014-05-29 03:37:37 +02:00
nutdec.c avformat/nutdec: Fix handling of older 4.0 files 2014-05-29 01:48:02 +02:00
nutenc.c avformat/nutenc: cleaner version check 2014-06-10 16:36:41 +02:00
nuv.c avformat/nuv: use ff_get_extradata() 2013-12-25 17:38:29 +01:00
oggdec.c Fix dont and doesnt typos 2014-04-27 15:14:32 +02:00
oggdec.h Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' 2014-05-28 13:02:19 +02:00
oggenc.c oggenc: Set the right AVOption size for the pref_duration option 2014-06-06 19:22:14 +03:00
oggparsecelt.c Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' 2014-05-28 13:02:19 +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 Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0' 2014-05-01 17:26:06 +02:00
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 Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3' 2013-09-30 02:15:36 +02:00
oma.h Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3' 2013-09-30 02:15:36 +02:00
omadec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
omaenc.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
options.c Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74' 2014-02-04 15:37:05 +01:00
options_table.h Allow values >31bit for -analyzeduration. 2014-06-10 14:28:34 +02:00
os_support.c Merge remote-tracking branch 'qatar/master' 2013-11-02 18:37:21 +01:00
os_support.h avformat: remove duplicate includes 2013-09-21 15:36:33 +02:00
paf.c Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033' 2014-03-28 04:32:05 +01:00
pcm.c lavf/pcm: remove redundant check 2014-04-20 20:56:02 +02:00
pcm.h
…
pcmdec.c Autodetect Asterisk raw pcm with extension "sln". 2014-05-22 15:15:04 +02:00
pcmenc.c
…
pjsdec.c avformat/pjsdec: dont increase pointer when its already at the end in read_ts() 2014-01-11 02:28:17 +01:00
pmpdec.c avformat/pmpdec: remove cur_dts timestamp hack 2014-04-21 01:29:08 +02:00
psxstr.c avformat/psxstr: zero packet to prevent uninitialized data to leak through to the decoder 2013-12-16 04:32:50 +01:00
pva.c avformat/pva: Make sure the header is large enough before reading the timestamp from it 2013-12-20 23:04:51 +01:00
pvfdec.c
…
qcp.c Add EVRCA and SMV codec id 2013-01-07 11:43:20 +00:00
qtpalette.h
…
r3d.c Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af' 2013-09-20 15:14:31 +02:00
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 rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE 2013-04-05 15:42:24 +00:00
rdt.c Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87' 2014-05-24 13:21:33 +02:00
rdt.h Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb' 2013-10-29 11:06:32 +01:00
realtextdec.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
redspark.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
replaygain.c avformat/replaygain: fix mixed declaration and statement 2014-04-18 01:16:27 +02:00
replaygain.h Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796' 2014-04-17 21:45:58 +02:00
riff.c Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 2014-04-23 20:47:13 +02:00
riff.h ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
riffdec.c avformat/riff: return error code from ff_get_guid() 2014-02-12 15:59:15 +01:00
riffenc.c Merge commit '584f88409062f7a134e7391887899e8e723ab6ff' 2014-05-17 20:22:56 +02:00
rl2.c avformat/rl2: use ff_get_extradata() 2013-12-25 17:38:29 +01:00
rm.c
…
rm.h
…
rmdec.c Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca' 2014-05-01 17:49:57 +02:00
rmenc.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
rmsipr.c
…
rmsipr.h
…
rpl.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
rsd.c avformat/rsd: use ff_get_extradata() 2013-12-25 17:38:30 +01:00
rso.c
…
rso.h
…
rsodec.c Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605' 2013-03-14 12:52:12 +01:00
rsoenc.c
…
rtmp.h Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f' 2013-06-02 10:30:35 +02:00
rtmpcrypt.c
…
rtmpcrypt.h
…
rtmpdh.c
…
rtmpdh.h
…
rtmphttp.c Merge remote-tracking branch 'qatar/master' 2013-11-18 16:02:50 +01:00
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: Make ff_rtp_codec_id() case insensitive 2013-08-05 21:53:52 +02:00
rtp.h Merge commit '2e814d0329aded98c811d0502839618f08642685' 2013-08-01 11:42:30 +02:00
rtpdec.c avformat/rtpdec: Enable GSM RTP depacketization 2013-12-08 18:38:01 +01:00
rtpdec.h rtpdec: make the NTP time values unsigned. 2014-05-09 15:10:57 +02:00
rtpdec_amr.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_asf.c Merge remote-tracking branch 'qatar/master' 2014-01-23 20:15:21 +01:00
rtpdec_formats.h Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec_g726.c Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43' 2013-05-06 10:19:56 +02:00
rtpdec_h263.c Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43' 2013-05-06 10:19:56 +02:00
rtpdec_h263_rfc2190.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
rtpdec_h264.c Merge remote-tracking branch 'qatar/master' 2013-12-14 22:39:57 +01:00
rtpdec_ilbc.c
…
rtpdec_jpeg.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_latm.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
rtpdec_mpeg4.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
rtpdec_mpeg12.c Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43' 2013-05-06 10:19:56 +02:00
rtpdec_mpegts.c Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43' 2013-05-06 10:19:56 +02:00
rtpdec_qcelp.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_qdm2.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
rtpdec_qt.c Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9' 2013-09-27 12:13:41 +02:00
rtpdec_svq3.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
rtpdec_vp8.c Merge remote-tracking branch 'qatar/master' 2013-03-03 11:40:37 +01:00
rtpdec_xiph.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
rtpenc.c avformat/rtpenc: switch to AVFMT_FLAG_BITEXACT 2014-05-18 04:02:44 +02:00
rtpenc.h Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05' 2013-11-01 19:34:19 +01: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.c
…
rtpenc_h263_rfc2190.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
rtpenc_h264.c rtpenc: fix overflow checking in avc_mp4_find_startcode() 2013-01-23 13:51:29 +02:00
rtpenc_jpeg.c
…
rtpenc_latm.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
rtpenc_mpv.c Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0' 2013-03-26 13:44:09 +01:00
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpproto.c avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed 2013-10-25 22:40:21 +02:00
rtpproto.h Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5' 2013-08-01 12:03:24 +02:00
rtsp.c Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3' 2014-05-31 12:53:46 +02:00
rtsp.h Add "prefer_tcp" flag to "rtsp_flags" 2014-03-04 22:54:13 +01:00
rtspcodes.h lavf/rtspcodes: add missing header include 2014-04-10 21:57:04 +02:00
rtspdec.c avformat/rtspdec: Use av_mallocz_array() 2014-05-27 20:42:50 +02:00
rtspenc.c avformat: extracting NTP timestamp from RTCP 2014-03-12 13:33:14 +01:00
samidec.c lavf: remove generic index flag from text subtitles. 2013-01-02 10:32:21 +01:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2013-04-09 11:36:39 +02:00
sapenc.c Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3' 2014-05-31 12:53:46 +02:00
sauce.c
…
sauce.h
…
sbgdec.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
sctp.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
sdp.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
sdr2.c avformat/sdr2: h264 stream needs parsing 2014-02-26 17:46:45 +00:00
seek-test.c seek-test: make duration user configurable 2013-05-21 18:13:25 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
seek.h lavf: remove unreliable timestamp guessing heuristic 2013-10-29 20:10:41 +01:00
segafilm.c avformat/segafilm: drop song and dance, this seems not to do anything anymore since a long time 2014-01-07 15:02:31 +01:00
segment.c avformat/segment: Use av_malloc_array() 2014-05-05 23:11:04 +02:00
sierravmd.c avformat/sierravmd: Check avio_read return value 2013-12-20 01:03:19 +01:00
siff.c avformat/siff: check avio_read() return value before returning packet 2013-12-29 13:25:13 +01:00
smacker.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
smjpeg.c
…
smjpeg.h
…
smjpegdec.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
smjpegenc.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
smoothstreamingenc.c avformat/smoothstreamingenc: Use av_mallocz_array() 2014-06-15 23:21:46 +02:00
smush.c Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' 2014-04-06 23:29:47 +02:00
sol.c
…
sox.h
…
soxdec.c soxdec: use meaningful error codes 2012-12-28 21:50:42 +00:00
soxenc.c soxenc: use ff_raw_write_packet() 2012-12-28 21:58:03 +00:00
spdif.c
…
spdif.h Merge commit '7df9e693a34c84c698da60426c78140c950f95ed' 2013-09-03 15:05:18 +02:00
spdifdec.c lavf/spdifdec: fix demuxing of AAC in IEC 61937 2013-10-29 22:45:27 +01:00
spdifenc.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
srtdec.c avformat/subtitles: add a next line jumper and use it. 2013-09-08 18:48:09 +02:00
srtenc.c lavf: remove some flushing in write_packet muxers callbacks. 2013-04-14 21:16:53 +02:00
srtp.c Merge remote-tracking branch 'qatar/master' 2013-04-09 11:36:39 +02:00
srtp.h Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610' 2013-01-21 15:00:45 +01:00
srtpproto.c Merge remote-tracking branch 'qatar/master' 2013-04-09 11:36:39 +02:00
subfile.c lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
subtitles.c avformat/vobsub: fix several issues. 2013-10-04 07:59:49 +02:00
subtitles.h avformat/vobsub: fix several issues. 2013-10-04 07:59:49 +02:00
subviewer1dec.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
subviewerdec.c avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y 2013-05-05 13:34:56 +02:00
swf.c
…
swf.h lavf/swf: remove unused assert include. 2013-05-26 15:48:50 +02:00
swfdec.c avformat/swfdec: clear 4 bytes at the end of a packet if they are not initialized 2013-12-19 05:07:22 +01:00
swfenc.c lavf: use av_fifo_freep 2014-05-07 23:39:47 +02:00
takdec.c avformat/takdec: zero padding area before use 2014-01-07 19:48:13 +01:00
tcp.c doc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentation 2013-12-25 18:42:26 +01:00
tedcaptionsdec.c avformat/tedcaptionsdec: make const arrays static const 2013-08-10 18:44:40 +02:00
tee.c avformat/tee: print errors for each failed bitstream filter 2014-04-26 21:08:44 +02:00
thp.c avformat/thp: check fps value during probing 2013-11-10 02:04:08 +01:00
tiertexseq.c
…
tls.c avformat/tls: Fix windows build with openSSL enabled. 2014-01-23 14:33:56 +01:00
tmv.c
…
tta.c avformat: use ff_alloc_extradata() 2013-10-13 20:13:38 +00:00
tty.c tty: make use of AV_OPT_TYPE_IMAGE_SIZE 2013-04-05 14:30:56 +00:00
txd.c Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091' 2014-04-22 13:30:23 +02:00
udp.c avformat/udp: fix build on MINIX 2014-06-07 14:43:07 +02:00
uncodedframecrcenc.c lavf: add uncodedframecrc test muxer. 2014-02-11 10:29:02 +01:00
unix.c avformat/unix: reshuffle #includes 2013-08-21 05:51:41 +02:00
url-test.c Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 2013-06-17 00:09:31 +02:00
url.c Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 2013-06-17 00:09:31 +02:00
url.h Merge remote-tracking branch 'qatar/master' 2013-10-30 17:48:47 +01:00
urldecode.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
urldecode.h
…
utils.c Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb' 2014-06-16 12:48:03 +02:00
vc1test.c avformat/vc1test: use ff_get_extradata() 2013-12-25 17:38:30 +01:00
vc1testenc.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
version.h Allow values >31bit for -analyzeduration. 2014-06-10 14:28:34 +02:00
vivo.c
…
voc.c
…
voc.h
…
vocdec.c avformat/vocdec: return AVERROR_EOF when EOF is reached 2013-10-13 09:50:38 +00:00
vocenc.c
…
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 Add VPlayer subtitles demuxer and decoder. 2012-12-30 22:46:42 +01:00
vqf.c avformat/vqf: check avio_read()s return value more completely 2014-01-01 16:53:54 +01:00
w64.c Merge commit '13f57a4d881ec669b87bf82f424bfff502433060' 2013-05-03 11:06:27 +02:00
w64.h w64: fact guid support 2013-01-07 10:08:38 +00:00
wavdec.c avformat/wavdec: enlarge probe_packets for wav 2014-04-19 03:54:10 +02:00
wavenc.c Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11' 2014-05-18 21:05:46 +02:00
wc3movie.c avformat/wc3movie: Check strings before printing. 2013-12-29 14:06:47 +01:00
webvttdec.c avformat/webvttdec: Dont skip over a never checked byte after --> 2014-01-07 04:09:19 +01:00
webvttenc.c avcodec/webvttenc: add webvtt encoder 2014-05-25 03:04:14 +02:00
westwood_aud.c Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af' 2013-05-05 12:31:03 +02:00
westwood_vqa.c avformat/westwood_vqa: use ff_get_extradata() 2013-12-25 17:38:30 +01:00
wtv.h wtv: make ff_format_videoinfo2 visible to wtv encoder 2013-12-23 19:43:09 +01:00
wtv_common.c wtv: make ff_format_videoinfo2 visible to wtv encoder 2013-12-23 19:43:09 +01:00
wtvdec.c avformat/wtvdec: ignore mpeg2 extradata 2014-05-01 18:36:27 +02:00
wtvenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
wv.c Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d' 2013-05-29 10:07:30 +02:00
wv.h Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d' 2013-05-29 10:07:30 +02:00
wvdec.c Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d' 2013-05-29 10:07:30 +02:00
wvenc.c lavf: Don't explicitly flush after each written packet in muxers 2013-09-16 22:17:33 +03:00
xa.c xa: abort if number of channels or sample rate is 0 2013-06-25 22:24:55 +00:00
xmv.c avformat/xmv: use av_malloc_array() 2014-04-15 13:51:48 +02:00
xwma.c avformat/xwma: fix memleak of dpds_table 2014-04-29 20:48:03 +02:00
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 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37' 2014-05-18 13:37:25 +02:00