generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
64,359 Commits 24 Branches 241 Tags 173 MiB
79d3eeb2b7
Commit Graph

146 Commits

Author SHA1 Message Date
Aurelien Jacobs
979c091056 add support for ASS like subtitles in Matroska 
Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-11 13:37:07 +00:00
Aurelien Jacobs
f7e97aaf87 add support for Matroska subtitle tracks 
Originally committed as revision 9591 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-11 13:13:20 +00:00
Aurelien Jacobs
eabb8ba445 add support for real audio in matroska 
Originally committed as revision 9217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 22:19:17 +00:00
David Conrad
b061d892ed split some common code from the mkv demuxer that will be useful to the muxer 
patch by David Conrad  umovimus _at_ gmail.com

Originally committed as revision 9215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 22:10:54 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +00:00
Aurelien Jacobs
7fdcdf25a1 cosmetics: indentation 
Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-10 11:27:24 +00:00
Aurelien Jacobs
6207bb209e add support for seeking to a keyframe instead of a random frame 
Originally committed as revision 8698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 17:03:20 +00:00
Aurelien Jacobs
79f2634686 add an intermediate variable (prepare for next patch) 
Originally committed as revision 8697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 17:00:09 +00:00
Aurelien Jacobs
cca9b6cdb3 add support for seeking in matroska files 
Originally committed as revision 8696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 16:48:28 +00:00
Aurelien Jacobs
df06539a25 move matroska_find_track_by_num() upper in the file 
so that it can be used by other part of the code

Originally committed as revision 8695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 16:45:43 +00:00
Aurelien Jacobs
67545b0ce6 cluster position is relative to segment_start 
Originally committed as revision 8694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 16:29:10 +00:00
Aurelien Jacobs
01344104c1 properly set streams start_time 
Originally committed as revision 8693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 16:27:00 +00:00
Aurelien Jacobs
8e7a7e6a01 remove unused context field 
Originally committed as revision 8692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 16:24:03 +00:00
Aurelien Jacobs
794857ae45 remove wrong and no more used packet reordering code 
Originally committed as revision 8691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-09 16:22:18 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Aurelien Jacobs
8509fc7b13 add support for V_THEORA into Matroska 
Original thread:
Date: Thu, 22 Mar 2007 20:23:08 -0400
Subject: [Ffmpeg-devel] [PATCH] Theora in MKV (GSoC '07 Qualification)

Originally committed as revision 8507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 01:11:00 +00:00
Aurelien Jacobs
262e2bee24 disable pts reordering code and initialize a parser instead 
Originally committed as revision 8418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-15 23:08:58 +00:00
Aurelien Jacobs
5ae4975c65 remove outdated comment 
Originally committed as revision 8370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-13 00:21:19 +00:00
Aurelien Jacobs
2b1785b7cc remove no more needed parameters 
Originally committed as revision 8369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-13 00:20:18 +00:00
Aurelien Jacobs
086b0ad8ca set pkt->duration for laced packets too 
Originally committed as revision 8366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-13 00:16:31 +00:00
Aurelien Jacobs
9b54ab15e7 calculate pts for laced packets 
Originally committed as revision 8365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-13 00:10:52 +00:00
Aurelien Jacobs
7fde6331a7 calculate default_duration for AAC tracks 
Originally committed as revision 8364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-13 00:02:55 +00:00
Aurelien Jacobs
25f2b76fdb scale duration and default_duration 
Originally committed as revision 8363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-13 00:01:24 +00:00
Aurelien Jacobs
916bf03a69 move timecode calculation out of laces loop 
Originally committed as revision 8359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 21:58:29 +00:00
Aurelien Jacobs
ded669f836 cosmetic: indent after last commit 
Originally committed as revision 8335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 23:44:13 +00:00
Aurelien Jacobs
ac9073c926 reorder pts of packets from tracks using V_MPEG* codecs 
Originally committed as revision 8334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 23:40:57 +00:00
Aurelien Jacobs
3d20538d07 revert r7181 
This was a stupid mistake. We already take care of time_scale
in av_set_pts_info().

Originally committed as revision 8333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 23:19:27 +00:00
Aurelien Jacobs
6bed20f45a check if current block contains a B frame and gives this info to parse_block() 
Originally committed as revision 8332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 23:05:01 +00:00
Aurelien Jacobs
4d41f3eea0 extract ebml_read_binary() out of matroska_parse_block() 
This allows to read all the blockgroup parameters before
parsing the block itself.

Originally committed as revision 8331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 22:54:15 +00:00
Aurelien Jacobs
12f3278dc5 reindent after last commit 
Originally committed as revision 8330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 22:28:03 +00:00
Aurelien Jacobs
0fb7a2b9bf parse clusters until some packets are queued 
instead of parsing only one cluster

Originally committed as revision 8329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 22:26:39 +00:00
Aurelien Jacobs
0f3bd8ce1b fix a stupid bug in ebml_read_sint() 
Originally committed as revision 8328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 22:19:02 +00:00
Aurelien Jacobs
912c94f3ff use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id() 
Originally committed as revision 8327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 22:16:38 +00:00
Aurelien Jacobs
3c58dc0b3c don't rely on a specific appearance order for ebml elements at the same level 
Originally committed as revision 8181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 00:14:53 +00:00
Aurelien Jacobs
0cc5ea2e95 add support for simple blocks (ie. matroska v2) 
Originally committed as revision 8180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 00:06:03 +00:00
Aurelien Jacobs
de7779b5fd cosmetics: fix indentation of the new matroska_parse_block() function 
Originally committed as revision 8179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 23:50:31 +00:00
Aurelien Jacobs
1afdcdf1fc split a matroska_parse_block() function from matroska_parse_blockgroup() 
Originally committed as revision 8178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 23:46:14 +00:00
Aurelien Jacobs
ebfcf31ddf fix an off-by-one error in probing function 
this prevented correct detection of Mushishi24-head.mkv

Originally committed as revision 8177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 23:36:39 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00
Aurelien Jacobs
be691b1060 matroska: scale timecode according to time_scale 
fixes jerky playback of planet.earth.mkv

Originally committed as revision 7181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-28 23:41:53 +00:00
Aurelien Jacobs
b9d328597c No need for special trick anymore for flac in matroska. 
The flac decoder now understand full metadata header in extradata.

Originally committed as revision 7162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-23 22:26:05 +00:00
Aurelien Jacobs
d9d6e7b7b9 add support for FLAC in matroska 
Originally committed as revision 7150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-21 23:47:21 +00:00
Aurelien Jacobs
0d6d963294 add support for tta in matroska 
Originally committed as revision 7138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 20:16:32 +00:00
Aurelien Jacobs
9a313fe040 cosmetics: reindent after last commit 
Originally committed as revision 7130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 00:33:47 +00:00
Aurelien Jacobs
a487d231cb matroska: split real video frames so that each packet contains only one slice 
Originally committed as revision 7129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 00:31:59 +00:00
Aurelien Jacobs
363c86ce66 matroska: properly handle real video extradata 
Originally committed as revision 7128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 00:15:52 +00:00
Aurelien Jacobs
a76920d843 simplify free()+set to NULL using av_freep() 
Originally committed as revision 7127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 00:04:08 +00:00
Aurelien Jacobs
7e2447028c Allows playback of truncated matroska files. 
Originally committed as revision 6989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 16:59:27 +00:00
Steve L'Homme
82bfffaf65 Fix wrong comment. 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Fri, 10 Nov 2006 15:29:50 +0100
Subject: [Ffmpeg-devel] [PATCH] fix a comment

Originally committed as revision 6965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 00:56:27 +00:00
Steve L'Homme
5d352ca98a Add A_AAC codec identifier support in matroska. 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Fri, 10 Nov 2006 15:22:33 +0100
Subject: [Ffmpeg-devel] [PATCH] Handle "A_AAC" in matroska codec IDs

Originally committed as revision 6964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 00:49:39 +00:00
Baptiste Coudurier
cbee7a6944 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used 
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-09 11:37:30 +00:00
Aurelien Jacobs
09c2b9421d add support for AAC in matroska 
Originally committed as revision 6947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-08 20:13:30 +00:00
Aurelien Jacobs
4647c0ec66 add audio output sampling freqency reading in matroska 
Originally committed as revision 6946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-08 20:09:56 +00:00
Aurelien Jacobs
95cc43b28b Better way to detect cluster (fix files encoded with Haali's muxer). 
Originally committed as revision 6943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-08 18:53:36 +00:00
Aurelien Jacobs
0ab07420a2 Allow reading matroska title. 
Originally committed as revision 6927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-07 00:11:35 +00:00
Aurelien Jacobs
5b99b90d38 cosmetics: reindent after last commit 
Originally committed as revision 6926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 23:58:41 +00:00
Aurelien Jacobs
ce99efc6ff Don't need to check for NULL before av_free(). 
And don't need to memset(0) the no more used priv_data.

Originally committed as revision 6925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 23:57:34 +00:00
Steve L'Homme
ae17bf6ac8 Add support for block duration. 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 19:22:14 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska block duration support

Originally committed as revision 6924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 23:52:10 +00:00
Steve L'Homme
063c8f2662 Ensure codec_id = CODEC_ID_NONE for unknown codecs (don't reuse previous one). 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 21:20:14 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska known/unknown codec

Originally committed as revision 6923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 23:14:37 +00:00
Steve L'Homme
b9756b2e39 guess matroska files frame rate 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 21:28:52 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska FPS info

Originally committed as revision 6922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 23:07:54 +00:00
Steve L'Homme
1c75f2bc5b remove floats in 10 bytes/byte support (no version of matroska used it) 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Nov 6, 2006 7:24 PM
Subject: [Ffmpeg-devel] [PATCH] no 10 bytes floats

Originally committed as revision 6919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 19:01:03 +00:00
Kostya Shishkov
3f509ba122 WavPack support in Matroska 
Originally committed as revision 6909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 06:07:41 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Måns Rullgård
191e8ca752 fix some signedness warnings 
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:47:39 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c 
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers 
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names 
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 23:40:53 +00:00
Stefan Huehner
a97c1e93aa Add (mostly) const to variable and parameter declaration, where a char* was 
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org

Originally committed as revision 5492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-17 15:53:23 +00:00
Måns Rullgård
a5e9102b4b free codec extradata in av_close_input_file 
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-16 07:54:37 +00:00
Michael Niedermayer
d766800b78 dont set random timestamps if they are not known 
Originally committed as revision 5219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-25 19:51:12 +00:00
Michael Niedermayer
78a11456a1 fixing timebase 
Originally committed as revision 5218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-25 19:40:27 +00:00
Steve L'Homme
662710ed35 Rename time variable to the more descriptive block_time. 
patch by Steve Lhomme steve.....lhomme..@..free.....fr

Originally committed as revision 5216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-25 13:37:34 +00:00
Steve L'Homme
d439facb3d duration and subitle fix from the patch by Steve Lhomme 
Originally committed as revision 5196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-22 11:11:02 +00:00
Michael Niedermayer
70596d04a8 cleanup codec_id mapping (untested) 
Originally committed as revision 5195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-22 11:06:08 +00:00
Michael Niedermayer
68ca39b21a fix aspect ratio 
Originally committed as revision 5192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-22 10:33:21 +00:00
Dieter
a851b8e898 add missing #includes 
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-30 23:32:14 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Michael Niedermayer
dcb2fb79b7 total == 0 seems like it should be valid (based upon patch by Steve Lhomme | slhomme divxcorp com) 
Originally committed as revision 4745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 11:27:37 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00
Michael Niedermayer
8baa661498 more non portable float parsing code ... 
Originally committed as revision 4462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-19 15:32:43 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 22:24:36 +00:00
Michael Niedermayer
2692067a45 AVPacket.pos 
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-26 20:17:12 +00:00
Måns Rullgård
ad2b531d3f change extradata format for vorbis 
Originally committed as revision 4235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-13 18:10:23 +00:00
Michael Niedermayer
f3356e9c9e more fine grained discarding of packets 
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-17 01:25:01 +00:00
D Richard Felker III
b2866c5cb5 Patch from Gianluigi Tiesi (sherpya at netfarm dot it): 
"A small patch to avoid error compiling matroska.c on mingw"
My comment: using typedefs for things like this is always ridiculous.

Originally committed as revision 4031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-11 19:52:43 +00:00
Måns Rullgård
d5be317cbe H.264 and Vorbis support in matroska patch by (Måns Rullgård |mru inprovide com) 
Originally committed as revision 4014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-06 19:52:41 +00:00
Michael Niedermayer
b9866ebcc7 support discarding uninterresting packets 
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-22 13:36:02 +00:00
Michael Niedermayer
568e18b15e integer overflows, heap corruption 
possible arbitrary code execution cannot be ruled out in some cases
precautionary checks

Originally committed as revision 3813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-08 14:21:33 +00:00
Michael Niedermayer
23c9925329 libdts support by (Benjamin Zores <ben at geexbox dot org>) 
Originally committed as revision 3310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-14 01:32:14 +00:00
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream 
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 20:43:21 +00:00
Alex Beregszaszi
e9afa2f4dd unknown format char 
Originally committed as revision 2976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-07 13:27:53 +00:00
Falk Hüffner
7906085fcc warning patrol 
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-24 23:32:48 +00:00
Michael Niedermayer
6e046750d8 big endian compile fix by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>) 
Originally committed as revision 2873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-12 02:26:01 +00:00
Michael Niedermayer
08abe0fd66 matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>) 
Originally committed as revision 2872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-11 16:26:42 +00:00