Commit Graph

680 Commits

Author SHA1 Message Date
Aurelien Jacobs
407c50a024 move FLAC mmx dsp to its own file
Originally committed as revision 11244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 22:20:47 +00:00
Ian Caulfield
6b493b2f2f MLP/TrueHD parser
Patch by Ian Caulfield, ian D caulfield <at> gmail D com
Thread: [PATCH] MLP/TrueHD decoder, 12 Oct 14:26

Originally committed as revision 11109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-28 14:27:53 +00:00
Aurelien Jacobs
5b67ce2afa build vc1dsp_mmx.c in its own compilation unit
Originally committed as revision 11102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-27 22:42:55 +00:00
Aurelien Jacobs
725d86bfd5 add pcm_s16le_planar support for electronicarts files
Originally committed as revision 11092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-25 16:32:47 +00:00
Aurelien Jacobs
4d4f59d750 split wmv2 encoder and decoder in their own files
Originally committed as revision 11091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-25 16:23:42 +00:00
Diego Biurrun
1b04f3e065 cosmetics: Keep all OBJS entries on a line of their own.
Originally committed as revision 11005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-12 22:29:37 +00:00
Baptiste Coudurier
5118cae694 ogg muxer
Originally committed as revision 10999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-10 18:27:03 +00:00
Michael Niedermayer
9abc7e0fdc intrax8 decoder patch by "someone"
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:37:48 +00:00
Aurelien Jacobs
cc6de104f8 split wmv2 in its own file
Originally committed as revision 10951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 23:41:39 +00:00
Kostya Shishkov
12877faf7c Musepack SV8 demuxer and decoder
Originally committed as revision 10938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 05:35:46 +00:00
Aurelien Jacobs
271b4095ad add Electronic Arts XAS ADPCM decoder
based on a patch from Peter Ross

Originally committed as revision 10913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-03 22:37:18 +00:00
Kostya Shishkov
24e649afe3 Split Musepack decoder into SV7 decoder and synth core
(for upcoming SV8 decoder)

Originally committed as revision 10905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-02 06:40:42 +00:00
Aurelien Jacobs
76c443c6d4 move adx.c to adxdec.c
Originally committed as revision 10904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:40:42 +00:00
Aurelien Jacobs
c31dea6136 split adx encoder in its own file
Originally committed as revision 10903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:38:15 +00:00
Aurelien Jacobs
f6e2300fe7 don't register adpcm encoders which are not implemented
Originally committed as revision 10894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 15:51:51 +00:00
Peter Ross
fac84d3c18 EA IMA EACS decoder
original patch by Peter Ross

Originally committed as revision 10880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:20:26 +00:00
Peter Ross
7bb65d8964 EA IMA SEAD decoder
original patch by Peter Ross

Originally committed as revision 10879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:12:18 +00:00
Peter Ross
e758396268 EA ADPCM R1, R2 and R3 decoder
original patch by Peter Ross

Originally committed as revision 10856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 20:49:42 +00:00
Kostya Shishkov
66f7679c62 Beam Software SIFF demuxer and video decoder
Originally committed as revision 10833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 06:01:38 +00:00
Diego Biurrun
24743a767f Rename LIB to LIBNAME for consistency.
Originally committed as revision 10774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 09:34:49 +00:00
Benjamin Larsson
636b13c5fc Nellymoser ASAO decoder
Originally committed as revision 10741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 16:26:02 +00:00
Aurelien Jacobs
f28b10483a add support for VP6 with huffman encoded blocks
closes issue 104

Originally committed as revision 10737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-14 22:30:59 +00:00
Aurelien Jacobs
437c2079b7 moves fraps huffman decoder to its own file, making it more generic
Originally committed as revision 10736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-14 21:19:40 +00:00
Aurelien Jacobs
0cd05c0820 VP6A needs its Makefile rules too
Originally committed as revision 10728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-14 01:16:15 +00:00
Aurelien Jacobs
bcf8eb116a oops... mpegvideo_enc also depends on motion_est and ratecontrol
Originally committed as revision 10695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-09 05:39:49 +00:00
Aurelien Jacobs
91ac0ab472 dnxhdenc depends on mpegvideo_enc (usage of ff_convert_matrix)
Originally committed as revision 10694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-09 04:49:12 +00:00
Baptiste Coudurier
fc4cbc1699 DNxHD (SMPTE VC-3) encoder
Originally committed as revision 10682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 11:27:18 +00:00
Marc Hoffman
b9dc32799b blackfin optimized vp3 transform and infastructure for idct
Originally committed as revision 10667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-04 20:47:12 +00:00
Diego Biurrun
6c05bab46d Merge mpegvideo AltiVec code into mpegvideo_altivec.c where it belongs.
Originally committed as revision 10641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-02 12:16:33 +00:00
Luca Barbato
89523beea4 Sanitize altivec code so it can be built with runtime check properly
Originally committed as revision 10640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-02 11:39:32 +00:00
Diego Biurrun
465c9fdeeb Remove pointless HAVE_ALTIVEC #ifdefs from a file that only contains AltiVec
optimizations and no general PPC optimizations. Instead make the file be
compiled conditional to HAVE_ALTIVEC.

Originally committed as revision 10637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-02 10:22:22 +00:00
Vladimir Voroshilov
8787d8377f AMV video decoder.
Patch by Vladimir Voroshilov (voroshil - gmail - com)

Originally committed as revision 10617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-29 15:20:22 +00:00
Vitor Sessak
3a7f5d072a AMV audio decoder
Originally committed as revision 10598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-27 06:21:57 +00:00
Diego Biurrun
8b03def65f Move VIS CFLAGS settings into configure.
Originally committed as revision 10555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-23 21:06:08 +00:00
Diego Biurrun
b146873c94 VIS-specific code should be compiled conditional to HAVE_VIS, not ARCH_SPARC.
Originally committed as revision 10554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-23 21:02:22 +00:00
Diego Biurrun
b3e4d266f4 Pass correct CPU flags to compilation of sparc/simple_idct_vis.o.
based on a patch by Denes Balatoni, dbalatoni interware hu

Originally committed as revision 10486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-13 09:13:56 +00:00
Kostya Shishkov
bf4a1f17ee Monkey Audio decoder
Originally committed as revision 10484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-13 03:22:47 +00:00
Benoit Fouet
bdfae2a575 Add a bitstream filter for H.264.
Originally committed as revision 10422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-06 12:36:07 +00:00
Diego Biurrun
770202c3af Sort one more list alphabetically.
Originally committed as revision 10401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-05 10:38:59 +00:00
Kostya Shishkov
c92a30bb06 Move H.264 intra prediction functions into their own context
Originally committed as revision 10397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-05 05:30:08 +00:00
Diego Biurrun
1e97ce4a31 cosmetics: Sort some lines, whitespace changes.
Originally committed as revision 10268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-30 23:11:24 +00:00
Denes Balatoni
d9420d4df1 add simple_idct implemented in Sparc VIS
patch by Balatoni Denes % dbalatoni A interware P hu%

Original thread: Messages starting with:
[PATCH] SPARC VIS simple_idct *

Originally committed as revision 10266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-30 19:18:23 +00:00
Diego Biurrun
e9bfae45bb cosmetics: alphabetical order
Originally committed as revision 10184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-22 13:19:10 +00:00
Marc Hoffman
18b8b43b4f make clean bfin
Originally committed as revision 10180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-22 12:54:49 +00:00
Justin Ruggles
6ea67bbb60 enable the native AC-3 decoder
Originally committed as revision 9968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-07 00:02:29 +00:00
Reimar Döffinger
7e2643ae8d First version of xsub decoder, not yet tested
Originally committed as revision 9933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:09 +00:00
Baptiste Coudurier
d3dc629c62 move dnxhd data tables to separate file
Originally committed as revision 9906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:41:33 +00:00
Panagiotis Issaris
bd38efffe8 Rename h264dsp.c to h264dspenc.c
Originally committed as revision 9819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 18:23:35 +00:00
Måns Rullgård
b958a7f111 separate en/decoder specific parts from png.c
Originally committed as revision 9686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-15 18:24:26 +00:00
Aurelien Jacobs
2a68cd08cd The mpegaudio parser depends on mpegaudiodata.o.
This fixes the following option set:
  --disable-encoders --disable-decoders --disable-parsers --disable-bsfs
  --disable-muxers --disable-demuxers --disable-protocols
  --enable-parser=mpegaudio

Originally committed as revision 9641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-14 13:23:26 +00:00
Aurelien Jacobs
00b5ec1578 Allow selecting only the vp6f decoder.
This fixes the following option set:
  --disable-encoders --disable-decoders --disable-parsers --disable-bsfs
  --disable-muxers --disable-demuxers --disable-protocols --enable-decoder=vp6f

Originally committed as revision 9640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-14 13:14:28 +00:00
Aurelien Jacobs
e2525c6f78 The svq3 decoder depends on h264idct.o and also requires h264_parser.
This fixes the following option set:
  --disable-encoders --disable-decoders --disable-parsers --disable-bsfs
  --disable-muxers --disable-demuxers --disable-protocols --enable-decoder=svq3

Originally committed as revision 9638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-14 13:11:15 +00:00
Måns Rullgård
00eb27f111 split lcl.c into lcldec.c, lclenc.c, lcl.h
Originally committed as revision 9613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-12 22:40:33 +00:00
Ivan Kalvachev
0ac9a875d4 revert commit 9603
Originally committed as revision 9605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-11 23:21:13 +00:00
Ivan Kalvachev
ddeaf723c5 Integrate reference mpeg IDCT into dsputil.
Originally committed as revision 9603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-11 22:05:43 +00:00
Aurelien Jacobs
a9fb241c3f conditional compilation of ratecontrol.c
Originally committed as revision 9589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-11 09:07:23 +00:00
Aurelien Jacobs
bdf5df0865 conditional compilation of motion_est.c
Originally committed as revision 9588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-11 08:59:52 +00:00
Aurelien Jacobs
df8e34603b makes compilation of h263.o and mpegvideo_enc.o conditional
Originally committed as revision 9583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-10 20:28:56 +00:00
Aurelien Jacobs
3a763f0f0b split rawvideo encoder and decoder in their own files
Originally committed as revision 9560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 16:26:11 +00:00
Aurelien Jacobs
0d336e44db compile rangecoder.o only when needed
Originally committed as revision 9559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 15:57:13 +00:00
Stefan Gehrer
844d9012a6 split decoder-specific parts into their own file
Originally committed as revision 9533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 07:37:30 +00:00
Aurelien Jacobs
5416616588 split SVQ1 decoder and encoder in their own files
Originally committed as revision 9507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 15:19:35 +00:00
Aurelien Jacobs
a6bc573158 split mpeg12 encoder out of mpeg12.c
Originally committed as revision 9477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 09:08:28 +00:00
Benoit Fouet
3ada94ba28 Description: split mpegvideo.c
Originally committed as revision 9467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-03 09:55:56 +00:00
Alexis Ballier
d3b7406c6f QT RLE encoder
patch by Alexis Ballier: [alexis ballier gmail com]
original thread: [FFmpeg-devel] [Patch] QT RLE encoder, bis
date: 06/24/2007 03:56 PM

Originally committed as revision 9452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-02 07:06:28 +00:00
Vitor Sessak
03e3e76544 RoQ video encoder
patch by Vitor: \vitor1001 gmail com/
original thread: [FFmpeg-devel] RoQ video encoder (take 3)
date: 06/08/2007 10:34 PM

Originally committed as revision 9420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-25 12:09:23 +00:00
Måns Rullgård
3f5b56e58b replace TARGET_* with HAVE_* simplifying lists in configure script
Originally committed as revision 9324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-15 20:35:44 +00:00
Måns Rullgård
18ca9a4a99 replace TARGET_ARCH_* to ARCH_* for consistency
Originally committed as revision 9322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-15 20:35:37 +00:00
Marc Hoffman
1a822d303f integrating MPV_common_init_bfin into the build system and mpegvideo.c
Originally committed as revision 9294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 19:34:06 +00:00
Diego Biurrun
2458c5c1c4 Use consistent names for all test programs.
Originally committed as revision 9252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 17:21:34 +00:00
Diego Biurrun
34933442ac Preprocessor #defines starting with __ are reserved for the system.
Originally committed as revision 9251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 17:19:37 +00:00
Diego Biurrun
9097a8e48d Add some forgotten lib prefixes to Makefile variables.
Originally committed as revision 9235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-06 18:56:14 +00:00
Diego Biurrun
6f1af73557 Give all wrappers for external libraries names starting with lib.
Originally committed as revision 9226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-06 00:14:18 +00:00
Vitor Sessak
55c970e349 Split RoQ decoder to accommodate future encoder patch
patch by Vitor vitor1001 gmail moc
original thread: [FFmpeg-devel] [PATCH] RoQ video encoder, take 2
date: 05/27/2007 12:21 PM

Originally committed as revision 9149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-29 15:01:33 +00:00
Panagiotis Issaris
4edda03480 Make the compilation of h264idct.c optional.
Originally committed as revision 9105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-23 09:07:23 +00:00
Diego Biurrun
f353fbd205 Remove mdct.o and fft.o from fft-test prerequisites list.
Both objects were added to the link command, resulting in multiple definitions
of symbols. Now linking works in the general case when mdct.o and fft.o are
compiled into libavcodec.a.

Originally committed as revision 9097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-22 07:08:38 +00:00
Panagiotis Issaris
6f9a35bb35 Only compile golomb.c when needed.
Originally committed as revision 9094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 15:28:37 +00:00
Panagiotis Issaris
d72ecaf5af Fix compilation when the Sonic encoder and decoder were disabled and only the Sonic
LS encoder enabled.

Originally committed as revision 9093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 15:24:31 +00:00
Panagiotis Issaris
8fae7b6f60 Only compile cabac.c when needed.
Originally committed as revision 9092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 12:55:02 +00:00
Panagiotis Issaris
d632239c9c Split the h261.c file into separate files for the encoder, decoder and common stuff.
Originally committed as revision 9090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 12:51:29 +00:00
Diego Biurrun
86c33b29d2 Rename motion_test.c to motion-test.c, which is the naming scheme used by all
other test programs. As a positive sideeffect, this makes the build system try
to actually create the executable file.

Originally committed as revision 9086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 07:11:27 +00:00
Aurelien Jacobs
9f77cab2a0 make compilation of mpegaudiodec conditional
Originally committed as revision 9083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 22:59:32 +00:00
Aurelien Jacobs
08aa2c9bd2 remove dependency of mpeg audio encoder over mpeg audio decoder
Originally committed as revision 9082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 22:50:29 +00:00
Aurelien Jacobs
4bd8e17c8d loosen dependencies over mpegaudiodec
Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 13:40:07 +00:00
Aurelien Jacobs
0a59a18b4e move mjpeg-b decoder in its own file
Originally committed as revision 9073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 14:58:31 +00:00
Aurelien Jacobs
40cce9ff91 move sp5x decoder in its own file
Originally committed as revision 9071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 14:40:02 +00:00
Aurelien Jacobs
5acd8d9e77 allows to disable jpegls decoder
Originally committed as revision 9070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 14:31:57 +00:00
Aurelien Jacobs
d2f43ca998 move mjpega_dump_header bitstream filter in its own file
Originally committed as revision 9068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:53:41 +00:00
Aurelien Jacobs
ab8072a6a2 move imx_dump_header bitstream filter in its own file
Originally committed as revision 9067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:44:41 +00:00
Aurelien Jacobs
8bf63e1c80 move dump_extradata bitstream filter in its own file
Originally committed as revision 9066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:35:27 +00:00
Aurelien Jacobs
5209c83607 move remove_extradata bitstream filter in its own file
Originally committed as revision 9065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:32:11 +00:00
Aurelien Jacobs
cd7105e6a0 move noise bitstream filter in its own file
Originally committed as revision 9064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:30:15 +00:00
Aurelien Jacobs
a975d9e288 move mp3_header_compress bitstream filter in its own file
Originally committed as revision 9063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:27:43 +00:00
Aurelien Jacobs
b57eed12da move mp3_header_decompress bitstream filter in its own file
Originally committed as revision 9062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:24:34 +00:00
Aurelien Jacobs
4991c0516d move some common mpeg audio tables from mpegaudiodectab.h to mpegaudiodata.c
Originally committed as revision 9060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:06:02 +00:00
Aurelien Jacobs
d9c9259f89 split ljpeg encoder out of mjpeg.c
Originally committed as revision 9057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-18 22:42:49 +00:00
Aurelien Jacobs
670a6b133b remove libdts decoder, we have a native dts decoder
Originally committed as revision 9051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 17:04:00 +00:00
Aurelien Jacobs
4922a5b0ee split mjpeg.c into an encoder and a decoder file
Originally committed as revision 9048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 16:29:11 +00:00
Benjamin Larsson
78a010fb00 Only compile fft and mdct when needed.
Initial patch by Benjamin Larsson.

Originally committed as revision 9046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 12:26:04 +00:00
Ronald S. Bultje
b550bfaa61 Add libavcodec to compiler include flags in order to simplify header
include paths in the source files.
mostly from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-16 09:51:45 +00:00
Panagiotis Issaris
9b5dc86746 Make vp3dsp*.c compilation optional.
Originally committed as revision 9025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-14 14:28:13 +00:00
Aurelien Jacobs
6ba04c2b03 split jpeg_ls into jpeglsdec, jpeglsenc and jpegls
Originally committed as revision 9021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-13 23:16:56 +00:00
Diego Biurrun
1adf2e564a Use TARGET_ARMV6 variable instead of HAVE_ARMV6 for consistency.
Originally committed as revision 9020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-13 22:15:52 +00:00
Aurelien Jacobs
f6993c9fa1 make compilation of mjpeg.c optional
Originally committed as revision 9011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 23:42:07 +00:00
Jason Millard
cd61e40781 allow to enable or disable every bitstream filters individually
Original patch by Jason Millard   jsm174 _at_ gmail
Date: On Fri, 11 May 2007 11:14:01 -0400
Subject: [FFmpeg-devel] enable/disable bitstream filters?

Originally committed as revision 9010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 23:33:53 +00:00
Diego Biurrun
7f4f3e169f cosmetics: Group all test targets together.
Originally committed as revision 9004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 10:43:45 +00:00
Aurelien Jacobs
9ac2e7971b rename pnm.c to pnmenc.c and pnm_common.c to pnm.c
Originally committed as revision 8996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-11 09:28:07 +00:00
Aurelien Jacobs
1b52bec7f7 make compilation of pnm.c optional
Originally committed as revision 8989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 23:16:56 +00:00
Aurelien Jacobs
426a189b77 move pnm parser in its own file
Originally committed as revision 8988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 23:03:14 +00:00
Aurelien Jacobs
b16560a389 move mjpeg parser in its own file
Originally committed as revision 8987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 22:37:36 +00:00
Aurelien Jacobs
26b4fe821c split h264.c to move parser in its own file
Originally committed as revision 8985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 22:26:44 +00:00
Aurelien Jacobs
07c55d8ea3 rename vorbis.c to vorbis_dec.c and vorbis_common.c to vorbis.c
Originally committed as revision 8981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 15:24:01 +00:00
Aurelien Jacobs
f6bd6eeffd loosen vorbis_enc.c dependencies by spliting vorbis.c
Originally committed as revision 8980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 15:17:17 +00:00
Panagiotis Issaris
7a0daaf18a Fix Vorbis encoder Xiph dependency by making sure the references to
ff_split_xiph_headers() are there.

Originally committed as revision 8978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 14:36:36 +00:00
Aurelien Jacobs
42ef2dbc77 split msmpeg4 data to easily share some of it with vc1.c
Originally committed as revision 8969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 10:03:16 +00:00
Aurelien Jacobs
1d557d3577 add missing rules for wmv2 compilation
Originally committed as revision 8968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:26:14 +00:00
Diego Biurrun
4a815a7f64 Allow conditional compilation of H.263-related decoders.
Originally committed as revision 8949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 09:26:06 +00:00
Aurelien Jacobs
c5a60225c7 move cavs parser in it's own file
Originally committed as revision 8945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 00:03:17 +00:00
Aurelien Jacobs
99ff31dc75 move aac and ac3 parsers in their own files
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 23:25:31 +00:00
Diego Biurrun
c33d98141d Move H.263 parser to its own file.
Originally committed as revision 8934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 08:52:38 +00:00
Ivo van Poorten
1ca779e7eb Renderware TXD decoder
Originally committed as revision 8926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 13:29:02 +00:00
Vitor Sessak
f025588bb6 RoQ audio encoder
patch by Vitor vitor1001 gmail com

Originally committed as revision 8922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 08:55:27 +00:00
Kostya Shishkov
986a865fc0 Move VC-1 data to .c file
Originally committed as revision 8915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 11:23:12 +00:00
Diego Biurrun
44c560003a Move dvdsub parser to its own file.
Originally committed as revision 8910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 09:12:10 +00:00
Diego Biurrun
027f43f095 Rename dvbsubdec_parser.c to dvbsub_parser.c.
Originally committed as revision 8909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 08:41:24 +00:00
Diego Biurrun
0d02cacda9 Move dvbsubdec parser to its own file.
Originally committed as revision 8906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 02:11:31 +00:00
Aurelien Jacobs
7f50d4ac51 move mpegvideo_parser in it's own file
Originally committed as revision 8901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 18:18:51 +00:00
Aurelien Jacobs
0cb4172803 move mpegaudio_parser in it's own file
Originally committed as revision 8899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 18:08:16 +00:00
Aurelien Jacobs
d2e911fac8 move mpeg4video_parser in it's own file
Originally committed as revision 8898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 17:59:37 +00:00
Diego Biurrun
442fc0e881 parser.c is compiled unconditionally, there is no need to compile it
conditional to CONFIG_AC3_PARSER.

Originally committed as revision 8895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 12:24:51 +00:00
Diego Biurrun
ab8a0d04e9 parser.c is compiled unconditionally, there is no need to compile it
conditional to CONFIG_CAVSVIDEO_PARSER.

Originally committed as revision 8892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 09:15:03 +00:00
Diego Biurrun
3883a99b7d Move H.261 parser to its own file.
Originally committed as revision 8888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 19:38:10 +00:00
Diego Biurrun
5982ae94ee Move VC1 parser to its own file.
Originally committed as revision 8882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 00:09:33 +00:00
Diego Biurrun
98c98e04cc Move dca parser to its own file.
Originally committed as revision 8881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-03 23:50:24 +00:00
Diego Biurrun
f5a756ef26 Give libamr decoders/encoders a lib prefix in the name.
Originally committed as revision 8880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-03 10:38:03 +00:00
Ivo van Poorten
b46d68c634 add V.Flash PTX decoder
Originally committed as revision 8856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-29 09:37:07 +00:00
Aurelien Jacobs
7adb10bedf move ac3 tables from a .h to a .c
Originally committed as revision 8816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 22:12:51 +00:00
Diego Biurrun
9cfacd527c cosmetics: Put AMR entry in alphabetical order with all external libraries.
Originally committed as revision 8814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 19:13:09 +00:00
Diego Biurrun
73508bc6d3 Remove hackish support for the non-free fixed-point AMR-NB reference code.
Originally committed as revision 8813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 19:12:04 +00:00
Alex Beregszaszi
ddec67e8b1 ac3 parser requires tables from ac3tab.h, which are compiled into ac3.c
Originally committed as revision 8765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 00:29:01 +00:00
Benjamin Larsson
10e26bc782 Atrac3 decoder.
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 20:53:39 +00:00
Diego Biurrun
98d0205145 Move AC3 header parsing code together with the rest of the AC3 parsing code.
Originally committed as revision 8739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 12:32:36 +00:00
Stanislav Brabec
91024272cb Replace hackish support for amr-nb and amr-wb. Instead of including the source
of the reference implementation it is possible to use proper libraries now.
patch by Stanislav Brabec, sbrabec suse cz, changes and bug fixes by me

Originally committed as revision 8717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 10:59:52 +00:00
Luca Barbato
1f1aadc37c ssd_int8_vs_int16_altivec, not completely benchmarkedwith svq1
Originally committed as revision 8706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 09:47:37 +00:00
Nicholas Tung
1e6c67599e Bethsoft VID demuxer and video decoder
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 20:51:58 +00:00
Marco Gerards
d1e0d21f94 THP PCM decoder, used on the Nintendo GameCube.
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 16:03:23 +00:00
Michael Niedermayer
efd2afc2ae TIFF-LZW encoding support by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl)
Originally committed as revision 8645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 15:15:45 +00:00
Anssi Hannula
9a0ddd09e7 Interplay C93 demuxer and video decoder
patch by Anssi Hannula, anssi.hannula gmail com

Originally committed as revision 8643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 14:25:25 +00:00
Xiaohui Sun
2d99eed135 SGI image decoder ported to the new image API.
patch by Xiaohui Sun, sunxiaohui dsp.ac cn

Originally committed as revision 8635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-06 18:29:27 +00:00
Michael Niedermayer
716222db17 tiff encoder by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl)
Originally committed as revision 8608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 13:43:57 +00:00
Michael Niedermayer
1ca286e194 generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
Originally committed as revision 8598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 01:01:46 +00:00
Marc Hoffman
b56a8374b1 Remove stray object from list of Blackfin assembler objects.
patch by Marc Hoffman, mmh pleasantst com

Originally committed as revision 8597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-02 07:26:14 +00:00
Marc Hoffman
67fd620c01 bfin dsputils, basic pixel operations sads, diffs, motion compensation
and standard IEEE 8x8 block transforms
patch by Marc Hoffman, mmh pleasantst com

Originally committed as revision 8594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 22:28:45 +00:00
Diego Biurrun
1026a8d4a7 Merge redundant comments.
Originally committed as revision 8582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 11:07:28 +00:00
Diego Biurrun
51aeb7aa6e dct-test works on non-x86 now.
Originally committed as revision 8577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 17:24:53 +00:00
Aurelien Jacobs
da91ed594e use generic xiph header spliting func to split theora headers
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 8506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 01:09:26 +00:00
Aurelien Jacobs
5bb127a98f extract vorbis header spliting code into a reusable function
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 8505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 01:06:45 +00:00
Baptiste Coudurier
52b6bad219 dnxhd decoder
Originally committed as revision 8445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 23:25:00 +00:00
Bobby Bingham
2c0c00cb14 Targa (.tga) encoder,
patch by Bobby Bingham % uhmmmm A gmail P com %
Only handles 24-bit BGR and 8-bit grayscale, no RLE at the moment either.
Original thread:
Date: Mar 11, 2007 7:58 PM
Subject: [Ffmpeg-devel] [PATCH] Targa encoder

Originally committed as revision 8411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 12:23:08 +00:00
Kostya Shishkov
33a0dd378a DXA demuxer and decoder
Originally committed as revision 8405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 14:49:49 +00:00
Justin Ruggles
43a0791b66 the AC-3 parser needs ac3.o
Originally committed as revision 8324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 16:57:05 +00:00
Justin Ruggles
4258a0a32a Remove common code from AC-3 encoder and utilize ac3.c.
Originally committed as revision 8306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-09 13:57:42 +00:00
Kostya Shishkov
01ca9ac334 DCA decoder
Originally committed as revision 8141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 06:30:40 +00:00
Diego Biurrun
3cee76e6c9 Remove useless conditional.
Originally committed as revision 8139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 00:18:38 +00:00
Diego Biurrun
e870111e4f Only compile snowdsp_mmx.c if the Snow decoder is enabled.
Originally committed as revision 8117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 11:59:26 +00:00
Diego Biurrun
3dc09ed188 simplify i386 object handling
Originally committed as revision 8056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-21 23:32:13 +00:00
Diego Biurrun
7bc5f2a8a4 Restore the possibility to link liba52 instead of dlopening.
Originally committed as revision 7945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 10:05:19 +00:00
Diego Biurrun
0900a85fe8 Remove internal liba52; external lib still works, native decoder coming up.
Originally committed as revision 7933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-11 16:29:00 +00:00
Diego Biurrun
9b1a3ea0de missing spaces
Originally committed as revision 7870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 12:38:47 +00:00
Michael Niedermayer
5968607304 wma encoder
Originally committed as revision 7855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-06 20:19:04 +00:00
Diego Biurrun
52548eeede BMP encoder by Michel Bardiaux, mbardiaux mediaxim be
Originally committed as revision 7824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-05 15:05:29 +00:00
Reimar Döffinger
4302963daa Move lzo decompression to libavutil
Originally committed as revision 7789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-31 22:58:53 +00:00
Måns Rullgård
7d42886b93 ARMv6 SIMD IDCT
Originally committed as revision 7752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-28 21:32:08 +00:00
Diego Biurrun
722dabcc94 Move conditional CFLAGS and OBJS setting to common place.
Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 00:34:38 +00:00
Diego Biurrun
150d27725b Theora encoding via libtheora.
courtesy of Paul Richards, paul.richards gmail com

Originally committed as revision 7698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 00:16:28 +00:00
Måns Rullgård
90d912afd9 remove no longer needed ifeq tests
Originally committed as revision 7618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:06:10 +00:00
Benjamin Larsson
053185c2fa Flash screen video encoder.
Originally committed as revision 7615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:56:20 +00:00
Diego Biurrun
efbd19fe76 Declare zlib dependency in the Makefile, not in the source.
Originally committed as revision 7610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:04:00 +00:00
Siarhei Siamashka
7a88606398 Optimization of 'dct_unquantize_h263_intra' for ARM (armv5te)
patch by Siarhei Siamashka % siarhei P siamashka A gmail P com %
Original thread:
Date: Jan 6, 2007 5:07 PM
Subject: [Ffmpeg-devel] [PATCH] Optimization of 'dct_unquantize_h263_intra' for ARM (armv5te) (try2)
and
Date: Jan 2, 2007 6:13 PM
Subject: [Ffmpeg-devel] [PATCH] Optimization of 'dct_unquantize_h263_intra' for ARM (armv5te)

Originally committed as revision 7423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 23:24:14 +00:00
Diego Biurrun
20c9dfe391 cosmetics: Reorder external libraries.
Originally committed as revision 7418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 00:07:10 +00:00
Diego Biurrun
6ebe07fbb5 variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 00:02:15 +00:00
Diego Biurrun
2eed5a461f Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin
Originally committed as revision 7416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-06 23:54:01 +00:00
Diego Biurrun
3ffab36139 variable renaming: dts --> libdts
Originally committed as revision 7415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-06 23:44:48 +00:00
Diego Biurrun
f8904fd959 Rename variables: a52 --> liba52, a52bin --> liba52bin
Originally committed as revision 7414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-06 23:33:43 +00:00
Kostya Shishkov
185c7b6b26 Musepack SV7 decoding support
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 04:51:43 +00:00
Panagiotis Issaris
c6b237da9e Adding H.264 DCT.
Originally committed as revision 7282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 15:53:55 +00:00
Panagiotis Issaris
e39e60a37e Adding function which enables writing H.264 NAL units.
Originally committed as revision 7273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 01:00:50 +00:00
Kostya Shishkov
3dd52c5afe Now ZMBV encoder compiles
Originally committed as revision 7259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 05:13:40 +00:00
Michael Niedermayer
f95778f80d fix compilation
Originally committed as revision 7248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 18:29:02 +00:00
Kostya Shishkov
f48d6e1b44 ZMBV encoder
Originally committed as revision 7242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 04:17:01 +00:00
Diego Biurrun
8cff89be43 Conditionally compile some of the AltiVec optimizations.
Originally committed as revision 7154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-22 09:20:16 +00:00
Diego Biurrun
248bc6bb8c Fix compilation with VC-1 decoder disabled.
Originally committed as revision 7149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-21 21:18:55 +00:00
Måns Rullgård
af63114e0d rename CONFIG_AC3 to CONFIG_A52
it's more consistent and Dolby never liked people "infringing" their TM

Originally committed as revision 7014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-13 22:09:31 +00:00
Stefan Gehrer
53aa68b329 move all cavs-parsing to cavs.c
This should help building parser without decoder

Originally committed as revision 6993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 20:18:07 +00:00
Måns Rullgård
997baf0141 allow spaces in source and build directory names
out of tree builds from a source dir with spaces is impossible
due to how make handles vpath

Originally committed as revision 6938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 00:02:15 +00:00
Baptiste Coudurier
93481fe5fe change gif muxer to simple gif encoder
Originally committed as revision 6874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-02 23:13:34 +00:00
Diego Biurrun
e164fbfeac Make tests compile on non-x86.
Originally committed as revision 6860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 18:51:37 +00:00
Diego Biurrun
9a64e0440e cosmetics: Restore alphabetical order.
Originally committed as revision 6848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-31 11:19:51 +00:00
Oded Shimon
e389399289 fix for disabling vorbis decoder but enabling vorbis encoder
Originally committed as revision 6841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-30 18:05:35 +00:00
Kostya Shishkov
84ed36da85 IMC decoder
Originally committed as revision 6839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-30 13:48:48 +00:00