Diego Biurrun
f1cc49a68e
typo
...
Originally committed as revision 25991 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-02-13 09:07:41 +00:00
Carl Eugen Hoyos
ae797914dd
Make dither4 & dither8 const.
...
Originally committed as revision 25967 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-02-09 22:57:37 +00:00
Reimar Döffinger
5802683a97
Make some assembler constants global instead of declaring them multiple times.
...
Originally committed as revision 25910 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-29 14:58:10 +00:00
Reimar Döffinger
d334c7c237
Use DECLARE_ASM_CONST where possible in libswscale code
...
Originally committed as revision 25903 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-28 14:38:11 +00:00
Reimar Döffinger
c14731d8da
Fix typo in comment
...
Originally committed as revision 25829 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-21 20:46:28 +00:00
Benoit Fouet
1b0a4572f4
Change (a == NULL) condition to (!a) and (a != NULL) condition to (a).
...
Originally committed as revision 25780 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 15:49:31 +00:00
Benoit Fouet
8916b4b55b
Remove some useless parentheses.
...
Originally committed as revision 25779 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 11:07:27 +00:00
Benoit Fouet
30c48a0af4
Cosmetics: whitespaces
...
Originally committed as revision 25778 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 10:24:14 +00:00
Benoit Fouet
e5091488a5
Remove non cosmetic spaces inside parentheses.
...
Originally committed as revision 25777 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 08:57:15 +00:00
Benoit Fouet
b8db4e22de
Description: remove superfluous parentheses.
...
Originally committed as revision 25776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 08:12:23 +00:00
KO Myung-Hun
337a2a4530
Check param in sws_getCachedContext().
...
Patch by KO Myung-Hun komh chollian net
Original thread: [FFmpeg-devel] [PATCH] param check in sws_getCachedContext()
Date: Wed Jan 9 11:15:19 CET 2008
Originally committed as revision 25775 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 08:06:09 +00:00
Diego Biurrun
56b69633dd
comment typo fixes
...
Originally committed as revision 25485 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-12-21 11:47:09 +00:00
Peter Schlaile
5efaf00029
Make sure strides have positive values before converting.
...
Patch by Peter Schlaile: peter schlaile de
Originally committed as revision 25467 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-12-20 10:08:36 +00:00
Diego Biurrun
c95a3a9fbf
Add missing declarations for AltiVec functions, fixes the warnings:
...
swscale_template.c:1171: warning: implicit declaration of function ‘altivec_yuv2packedX’
swscale.c:1982: warning: implicit declaration of function ‘yuv2rgb_altivec_init_tables’
yuv2rgb.c:652: warning: implicit declaration of function ‘yuv2rgb_init_altivec’
Originally committed as revision 25319 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-12-08 04:29:11 +00:00
Diego Biurrun
4706949c6d
Fix 'make checkheaders' on AltiVec-enabled systems.
...
Originally committed as revision 25316 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-12-07 15:30:12 +00:00
Diego Biurrun
737278c86a
Fix some spelling typos
...
Originally committed as revision 25245 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-12-02 14:07:01 +00:00
Diego Biurrun
bc279024c2
Comment some #endif directives.
...
Originally committed as revision 25211 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-11-30 13:21:20 +00:00
Diego Biurrun
594ff7cc6c
comment spelling/grammar fixes
...
Originally committed as revision 25137 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-11-22 10:27:58 +00:00
Diego Biurrun
a680708d2d
The function names of [rgb|bgr]1[56]to[UV|Y] had rgb<->bgr flipped.
...
Rename them to match the actual implementation. Fixes issue 162.
Originally committed as revision 24965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-11-04 12:34:46 +00:00
Diego Biurrun
2f3cbef06e
Rename LIB to LIBNAME for consistency.
...
Originally committed as revision 24802 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-18 09:35:02 +00:00
Diego Biurrun
522e9cf4e0
1l: Update wrong #endif comment.
...
Originally committed as revision 24801 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-18 09:31:47 +00:00
Diego Biurrun
39c70be189
Add FFMPEG_ prefix to all multiple inclusion guards.
...
Originally committed as revision 24800 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-18 09:30:33 +00:00
Diego Biurrun
298726ba55
cosmetics: Fix AltiVec spelling.
...
Originally committed as revision 24685 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-02 10:37:59 +00:00
Diego Biurrun
721d5e3b95
Revert wrong ARCH_BFIN --> HAVE_BFIN change.
...
Originally committed as revision 24627 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-09-27 08:00:22 +00:00
Aurelien Jacobs
79973335d3
add support for yuva420p colorspace (yuv420p + alpha)
...
Originally committed as revision 24601 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-09-24 15:11:49 +00:00
Michael Niedermayer
35fb8134c1
cosmetic (get rid of _ at the start of local variable names)
...
Originally committed as revision 24597 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-09-24 07:31:43 +00:00
Marc Hoffman
49488d12bf
renaming ARCH_BFIN to HAVE_BFIN
...
Originally committed as revision 24309 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-08-31 14:57:50 +00:00
Diego Biurrun
035c591983
cosmetics: Sort some lines, whitespace changes.
...
Originally committed as revision 24305 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-08-30 23:11:55 +00:00
Diego Biurrun
6465c977b7
Move Apple gcc AltiVec vector declaration syntax to libavutil.
...
Originally committed as revision 24143 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-08-24 15:04:14 +00:00
Diego Biurrun
d8e84202c7
Rename CONFIG_DARWIN to SYS_DARWIN, it is not configurable (in FFmpeg).
...
Originally committed as revision 24121 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-08-22 22:46:55 +00:00
Diego Biurrun
bd7c6fd50c
typo
...
Originally committed as revision 23889 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-28 14:17:25 +00:00
Marc Hoffman
7889f52890
integrating blackfin optimized yuyvtoyv12 converter
...
Originally committed as revision 23833 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-20 00:11:38 +00:00
Marc Hoffman
b41c9046cc
removing reference to bfin_sram.h its not used anylonger
...
Originally committed as revision 23832 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-20 00:10:55 +00:00
Marc Hoffman
4055d27121
adding blackfin optimized yuyvtoyv12 converter
...
Originally committed as revision 23831 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-20 00:09:45 +00:00
Denes Balatoni
90c1d7b400
UltraSPARC VIS yuv2rgb
...
patch by Denes Balatoni: [dbalatoni interware hu]
original thread: [FFmpeg-devel] [PATCH] UltraSPARC VIS yuv2rgb third try
date: 07/17/2007 08:35 PM
Originally committed as revision 23825 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-19 07:24:43 +00:00
Andreas Öman
9ba7fe6dcb
use YUV440P in swscale
...
patch by Andreas Öman: \andreas olebyn nu/
original thread: [FFmpeg-devel] half vertical chroma resolution from JPEGs..
date: 07/03/2007 01:29 PM
Originally committed as revision 23811 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-18 08:12:40 +00:00
Diego Biurrun
325751ef32
This was rewritten by Michael, switch copyrights to him and license to LGPL.
...
Originally committed as revision 23796 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-17 09:35:21 +00:00
Diego Biurrun
fc69cc615e
Remove redundant "all rights reserved" statement, OKed by Walken.
...
Originally committed as revision 23791 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-16 17:48:02 +00:00
Diego Biurrun
cabc90c2ce
typo
...
Originally committed as revision 23780 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-14 14:39:51 +00:00
Luca Abeni
aa89fa07b0
Remove unused file (this time for real)
...
Originally committed as revision 23767 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-11 15:29:20 +00:00
Luca Abeni
0d79efeba9
Resurrect yuv2rgb_init.c, to add a proper license (and some comments about
...
its origin) in it.
Originally committed as revision 23759 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-10 11:18:55 +00:00
Diego Biurrun
7ed8ccb50e
ISO8859-1 --> UTF-8
...
Originally committed as revision 23752 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-09 18:55:31 +00:00
Diego Biurrun
b19bcbaa78
license header consistency cosmetics
...
Originally committed as revision 23722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-05 10:18:58 +00:00
Diego Biurrun
c1578479d3
Group all copyright and author notices together.
...
Originally committed as revision 23721 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-05 10:18:27 +00:00
Luca Abeni
6969e0a030
Remove unused file
...
Originally committed as revision 23715 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-03 13:52:36 +00:00
Diego Biurrun
064cd7a897
Fix 'make checkheaders'.
...
Originally committed as revision 23701 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-02 12:52:41 +00:00
Diego Biurrun
26e16be00e
Remove obsolete and misleading comment.
...
Originally committed as revision 23700 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-02 11:43:38 +00:00
Diego Biurrun
ddda6fcddc
comment grammar fixes
...
Originally committed as revision 23685 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-28 11:18:16 +00:00
Marc Hoffman
1ebbfe159f
integrating ff_bfin_get_unscaled_swscale into the system
...
Originally committed as revision 23605 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-22 13:03:40 +00:00
Marc Hoffman
c185b405c1
adding Blackfin swscale_bfin infrastructure, and the first swscale routine uyvy to yv12 video resampler
...
Originally committed as revision 23604 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-22 12:45:18 +00:00
Marc Hoffman
69a6db95ac
document pointer offset by -8
...
Originally committed as revision 23603 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-22 00:14:22 +00:00
Marc Hoffman
e9d4375f1a
re pipeline loop, to eliminate extra chroma reads
...
Originally committed as revision 23602 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-22 00:12:44 +00:00
Marc Hoffman
45eeae39ac
correct chroma skewing bug, caused by incorrect stride adjustments
...
Originally committed as revision 23601 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-22 00:07:55 +00:00
Reimar Döffinger
a444671542
Missing libswscale part of TARGET_ -> HAVE_ change
...
Originally committed as revision 23564 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-16 15:29:26 +00:00
Reimar Döffinger
6e6203fb1c
Copile fix: missing libswscale part of ffmpeg r9322 TARGET_ARCH -> ARCH change.
...
Originally committed as revision 23562 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-16 15:17:00 +00:00
Diego Biurrun
86bdf3fd3d
misc spelling fixes
...
Originally committed as revision 23556 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-13 17:48:15 +00:00
Reimar Döffinger
1a18eaf760
Fix yuv2rgb C functions to work for widths divisible by 4 but not by 8
...
Originally committed as revision 23508 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-08 07:49:59 +00:00
Marc Hoffman
22a11d578e
correcting spelling error, yuv2rgb888_line was renamed to yuv2rgb24_line
...
Originally committed as revision 23472 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-05 13:18:16 +00:00
Carl Eugen Hoyos
2db27aadcb
rename attribute_unused to av_unused as it is declared in common.h
...
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM
Originally committed as revision 23418 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-30 09:33:09 +00:00
Diego Biurrun
4d7b302c0d
Remove redundant fastmemcpy.h #include, it is indirectly #included by avutil.h.
...
Originally committed as revision 23400 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-28 09:30:56 +00:00
Ivo van Poorten
d61845e8ae
ffmpeg -sws_flags command line option to set swscaler flags
...
Originally committed as revision 23379 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-23 18:35:24 +00:00
Marc Hoffman
bf4a90fcc3
Blackfin optimized uyvytoyv12 routine. the implementation includes chroma averaging.
...
This is 10x faster than the cooresponding C function.
Originally committed as revision 23345 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-19 12:57:17 +00:00
Diego Biurrun
9f17e13bfc
Remove extern C declarations for C++.
...
FFmpeg is pure C and not all public headers have the declarations.
Originally committed as revision 23322 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-16 12:26:47 +00:00
Marc Hoffman
d3f3eea92d
Blackfin optimized YUV420 to RGB CSC Color Space Converters.
...
YUV2 -> RGB BGR for 565, 555 and 888 a.k.a. 24bit color.
Speed-up compared to C version compiled with -O3 187.28%
Patch by Marc Hoffman %mmh A pleasantst P com%
Original thread:
Date: May 9, 2007 2:46 AM
Subject: [FFmpeg-devel] PATCH BlackFin yuv2rgb color space conversion
Originally committed as revision 23307 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-13 19:22:32 +00:00
Ivo van Poorten
9d9de37d81
cosmetics; one test per line for all isXXX(x) macros
...
Originally committed as revision 23296 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-11 11:24:06 +00:00
Ivo van Poorten
fa88429489
remove the need of one extra shift in rgb16ToUV
...
Originally committed as revision 23281 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-09 21:34:05 +00:00
Ivo van Poorten
f96829d2d0
Fix rgb15ToUV. Correct order of components and use one shift less.
...
Originally committed as revision 23279 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-09 17:29:20 +00:00
Benoit Fouet
c4ca31d0a8
cosmetics: indentation after previous patch
...
Originally committed as revision 23207 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-02 07:02:16 +00:00
Benoit Fouet
068b0f4f29
test if color conv fonction exists prior to using it
...
Originally committed as revision 23206 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-02 07:00:10 +00:00
Diego Biurrun
2da0d70d5e
cosmetics attack, part IV: Remove all tabs and prettyprint/reindent the code.
...
Originally committed as revision 23179 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-30 08:05:29 +00:00
Diego Biurrun
428098165d
cosmetics attack, part III: Remove all tabs and prettyprint/reindent the code.
...
Originally committed as revision 23175 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-29 21:36:43 +00:00
Diego Biurrun
ce505b8523
cosmetics: Fix stray wrongly indented line.
...
Originally committed as revision 23174 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-29 13:39:50 +00:00
Diego Biurrun
221b804f34
cosmetics attack, part II: Remove all tabs and prettyprint/reindent the code.
...
Originally committed as revision 23173 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-29 13:39:27 +00:00
Diego Biurrun
6e42e6c4b4
cosmetics attack, part I: Remove all tabs and prettyprint/reindent the code.
...
Originally committed as revision 23158 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-28 11:44:49 +00:00
Diego Biurrun
1da87823db
cosmetics: Replace manual tab indentation by \n\t as in the rest of the file.
...
Originally committed as revision 23157 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-28 11:41:11 +00:00
Diego Biurrun
6a4970abd1
cosmetics: Remove trailing whitespace.
...
Originally committed as revision 23147 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-26 23:07:11 +00:00
Diego Biurrun
c36bd2866a
Don't declare -lm as a dependency of swscale-example.
...
Originally committed as revision 23140 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-26 15:14:12 +00:00
Marc Hoffman
26cdb9a2aa
Remove large automatics from stack.
...
patch by Marc Hoffman, mmh pleasantst com
Originally committed as revision 23117 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-26 11:05:59 +00:00
Ivo van Poorten
3052ddb2a8
preserve alpha channel when converting rgb32 to bgr32 in plain C
...
Originally committed as revision 23022 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 16:40:58 +00:00
Ivo van Poorten
19b202f9d1
fix red_15mask and green_15mask. the previous values were wrong and caused
...
some SIMD functions to output wrong data.
Originally committed as revision 23021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 16:40:07 +00:00
Ivo van Poorten
0c4c70e5ef
test widths all down to one. this tests whether the scalers correctly switch
...
to plain C when width < unit size of assembly code.
Originally committed as revision 23018 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 14:22:42 +00:00
Ivo van Poorten
35a9994977
skip MMX code in rgb24tobgr24 if the size of the input is smaller than the
...
size of the units the MMX code processes
Originally committed as revision 23015 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 09:27:59 +00:00
Ivo van Poorten
3983057065
skip MMX code in rgb32to16 if the size of the input is smaller than the
...
size of the units the MMX code processes
Originally committed as revision 23014 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 09:26:22 +00:00
Ivo van Poorten
b2117ceed0
skip MMX code in rgb32to15 if the size of the input is smaller than the
...
size of the units the MMX code processes
Originally committed as revision 23013 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 09:24:49 +00:00
Ivo van Poorten
935f50c82c
slightly faster rgb32tobgr32; avoid one add and one cmp
...
Originally committed as revision 23012 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-17 20:38:17 +00:00
Ivo van Poorten
b38d487466
New implementation of rgb32tobgr32
...
The previous implementation segfaulted with MMX enabled when fed an image
smaller than the size of the units the MMX code processed. The new code:
- is faster for MMX, MMX2 and plain C
- processes small images correctly
- is LGPL
Originally committed as revision 23009 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-16 21:41:03 +00:00
Michael Niedermayer
fa65e2f63a
improve horizontal chroma resolution with pal
...
Originally committed as revision 22994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-15 01:27:34 +00:00
Michael Niedermayer
21c08a3f1c
convert palette to yuv instead of converting each pixel after pal->rgb
...
Originally committed as revision 22993 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-15 00:53:32 +00:00
Ivo van Poorten
3a74415d59
cosmetics, expand all tabs to four spaces.
...
Originally committed as revision 22983 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-12 19:31:35 +00:00
Ivo van Poorten
2a80b21d38
Replace huge switch statement by a lookup table.
...
Add newline to final report.
Originally committed as revision 22982 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-12 19:25:36 +00:00
Ivo van Poorten
ea70817379
cosmetics after last commit; remove superfluous braces
...
Originally committed as revision 22979 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-11 22:17:58 +00:00
Ivo van Poorten
df170b81d9
Remove code duplication in sws_rgb2rgb_init.
...
The lists of assignments of all rgbxtoy variants are removed from
sws_rgb2rgb_init and replaced by a single list inside the template file.
This way, multiple lists are generated by the preprocessor and each list
gets its own initialization function. Those are called from the main
sws_rgb2rgb_init function, if applicable.
Originally committed as revision 22978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-11 21:00:25 +00:00
Diego Biurrun
911406f2c4
typo
...
Originally committed as revision 22932 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-07 14:07:51 +00:00
Carl Eugen Hoyos
94bd08b069
Fix crash when trying to convert from or to RGBi (i<15) as in bgr8torgb24
...
Originally committed as revision 22910 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-03 16:22:19 +00:00
Marc Hoffman
8ec491e3fd
Handle proper compilation on Mac OS X.
...
Fix data alignment bug (the original purpose of the code is unclear, though).
patch by Marc Hoffman, mmh pleasantst com
Originally committed as revision 22847 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-30 22:09:13 +00:00
Michael Niedermayer
edf97a75f9
fix full range (jpeg yuv) chroma
...
Originally committed as revision 22713 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-18 12:31:53 +00:00
Karl H. Beckers
6cbac7ed3a
Add PIX_FMT_PAL8 to isPacked().
...
patch by "Karl H. Beckers", karl.h.beckers gmx net
Originally committed as revision 22487 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-08 10:02:49 +00:00
Michael Niedermayer
dd9bdeb9f3
a small step toward 4 plane support
...
Originally committed as revision 22411 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-02 13:33:18 +00:00
Michael Niedermayer
0c84001325
copy src to prevent the user supplied argumet from being changed
...
Originally committed as revision 22410 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-02 13:32:10 +00:00
Reimar Döffinger
9340a99588
Fix a possible crash on 64 bit systems when the lumSrcPtr or chrSrcPtr
...
does not fit in 32 bits. The SWS_ACCURATE_RND is still broken though.
Originally committed as revision 22401 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-01 19:48:40 +00:00
Diego Biurrun
2bfdde2435
Remove useless conditional.
...
Originally committed as revision 22355 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-27 00:19:01 +00:00
Reimar Döffinger
adcec46a83
Add av_ prefix to clip functions
...
Originally committed as revision 22339 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-25 10:27:43 +00:00
Diego Biurrun
606f68bd10
cosmetics: typo fixes, usefuLL --> useful and aswell --> as well
...
Originally committed as revision 22307 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-22 00:18:10 +00:00
Michael Niedermayer
20da77449d
negative stride and h_size-=8 fix
...
Originally committed as revision 22247 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-17 13:28:44 +00:00
Michael Niedermayer
18064f5cf3
BGR/RGB4 byte formats as input
...
fixing isRGB/BGR() for the byte formats
Originally committed as revision 22244 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-17 11:36:02 +00:00
Michael Niedermayer
e28630fc70
pal8 input
...
this is not optimized or anything (that is easy to add just use the existing unscaled converters if possible ...)
Originally committed as revision 22236 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-16 21:17:15 +00:00
Luca Barbato
94d122e96e
stray fflush spotted by Aurel
...
Originally committed as revision 22051 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-28 20:38:35 +00:00
Luca Barbato
66e9de3891
Make example and test build and link correctly
...
Originally committed as revision 22048 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-28 17:52:59 +00:00
Luca Barbato
da095a23a1
av_logify
...
Originally committed as revision 22047 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-28 17:51:41 +00:00
Diego Biurrun
91f2de5e18
Simplify conditional compilation handling.
...
Originally committed as revision 22009 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-25 00:35:29 +00:00
Luca Abeni
2d529db50f
Pass a context to av_log(), when possible
...
Originally committed as revision 21999 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-23 13:41:45 +00:00
Diego Biurrun
2c86a5786a
Fix license headers and FSF postal address.
...
Originally committed as revision 21994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-22 01:21:36 +00:00
Diego Biurrun
10ef990d96
cosmetics: typo pallete --> palette
...
Originally committed as revision 21892 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-13 04:32:14 +00:00
Luca Abeni
d28ef27031
deprecate sws_scale_ordered(), as it now is a duplicate of sws_scale()
...
Originally committed as revision 21888 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-12 15:45:47 +00:00
Luca Abeni
703b56fb5d
Add "support for both orderings of the slices (top->down / bottom->up)"
...
(r15249) to sws_scale() too (until now, it only was in sws_scale_ordered())
Originally committed as revision 21887 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-12 15:40:08 +00:00
Luca Abeni
0dea6433fd
replace some av_malloc();memset(...,0,...) sequences with av_mallocz()
...
Originally committed as revision 21835 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-06 12:11:25 +00:00
Luca Abeni
b2afecbe02
change all the occurrences of "FFMIN(FFMAX())" to clip_uint8() or clip()
...
Originally committed as revision 21776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 18:08:40 +00:00
Luca Abeni
789237cad0
Mark some variables as possibly unused to avoid warnings
...
Originally committed as revision 21775 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 17:59:28 +00:00
Luca Abeni
628bc5e862
Add some explicit casts to avoid "assignment from incompatible pointer type"
...
warnings
Originally committed as revision 21774 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 17:41:38 +00:00
Luca Abeni
44060a7391
Add some other casts, to remove void pointers arithmetic
...
Originally committed as revision 21773 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:28:34 +00:00
Luca Abeni
7d19628b14
Add some explicit casts to avoid some warnings
...
Originally committed as revision 21772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:21:13 +00:00
Luca Abeni
9effd94abc
Remove some void pointers arithmetic
...
Originally committed as revision 21771 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:12:37 +00:00
Luca Abeni
d32d303568
Clarify that yuv2rgb_init.c cannot be used under LGPL
...
Originally committed as revision 21730 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-22 17:57:19 +00:00
Luca Abeni
19a6be3463
Remove useless include (not needed now that libswscale uses libavutil)
...
Originally committed as revision 21728 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-22 11:22:49 +00:00
Luca Abeni
0683a5c558
Fix compilation of non-MMX code with gcc 2.95
...
Originally committed as revision 21702 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 15:58:15 +00:00
Luca Abeni
9bde778e73
Allow to compile swscale's non-SIMD code under the LGPL license.
...
Since mplayer always define CONFIG_GPL, this commit should not change
anything for mplayer.
Originally committed as revision 21699 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 13:09:29 +00:00
Reimar Döffinger
e96da13bc7
Change "p" asm constraints to "g", since "p" was a no longer necessary hack to
...
make AMD64 compilation work and ICC can not handle "p".
Originally committed as revision 21341 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-27 21:59:13 +00:00
Luca Abeni
807e0c6645
Clarify that some of the non-SIMD code is now LGPLed.
...
All the authours of such code agreed.
Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-19 10:38:12 +00:00
Michael Niedermayer
6264a515d0
forgotten 2 converters (yeah svn up, svn di svn ci isnt enough i should actually look at the code after svn up not just the diff ...)
...
Originally committed as revision 20962 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-16 14:49:04 +00:00
Michael Niedermayer
c2271987f8
fixing the lamest bug in swscale, all the rgb/bgr->* code did 2x2 downsampling for chroma, it should just be 2x1 (the rest of the code also belived its 2x1 ...)
...
Originally committed as revision 20961 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-16 14:44:00 +00:00
Diego Biurrun
4cedbe5c8a
Remove stray newline.
...
Originally committed as revision 20959 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-16 12:49:27 +00:00
Luca Abeni
7964ed71e9
Synch with ffmpeg's r6938 "allow spaces in source and build directory names..."
...
Originally committed as revision 20816 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-09 15:13:56 +00:00
Nigel Pearson
d904b5fc66
Fix MacIntel build: "/nop" is illegal on Apple's older version of GAS
...
Patch by Nigel Pearson % nigel A ind P tansu P com P au %
Original thread:
Date: Nov 6, 2006 10:43 PM
Subject: [Ffmpeg-devel] [PATCH] swscale uses /nop, illegal for old versions of GAS
Originally committed as revision 20740 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-07 07:07:05 +00:00
Luca Abeni
a43fb6b37e
Add support for conversions from the rgb565 and rgb555 formats
...
Originally committed as revision 20605 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-02 09:01:01 +00:00
Diego Biurrun
484267f3d3
Do not mix declarations and statements.
...
Originally committed as revision 20600 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-01 19:44:35 +00:00
Diego Biurrun
3d6a30d948
Use common define for x86_32 and x86_64.
...
Originally committed as revision 20592 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-01 18:36:20 +00:00
Kostya Shishkov
4884b9e50d
16-bit grayscale support
...
Originally committed as revision 20427 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-24 05:02:33 +00:00
Luca Abeni
7c9c296648
Properly set EXTRALIBS
...
(fixes compilation of shared libswscale on cygwin and other platforms)
Originally committed as revision 20413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-23 14:03:49 +00:00
Diego Biurrun
05749630e8
Rename ABS macro to FFABS.
...
Originally committed as revision 20169 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-11 23:18:34 +00:00
Diego Biurrun
086b05cdad
Move CFLAGS handling to common.mak.
...
Originally committed as revision 20154 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-11 08:30:22 +00:00
Diego Biurrun
d026b45e73
Change license headers to say 'FFmpeg' instead of 'this program'.
...
Originally committed as revision 20100 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-07 15:33:14 +00:00
Diego Biurrun
21423ad9b7
Replace -I.. by -I$(BUILD_ROOT).
...
Originally committed as revision 20094 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-07 09:23:09 +00:00
Diego Biurrun
aae0bc19b1
Simplify test program build.
...
Originally committed as revision 20073 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-05 17:11:05 +00:00
Diego Biurrun
6a07717908
Test programs depend on $(LIB).
...
Originally committed as revision 20059 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-05 00:57:48 +00:00
Diego Biurrun
777938e190
FFmpeg uses -D_ISOC9X_SOURCE and not -D_GNU_SOURCE in CFLAGS.
...
Originally committed as revision 20057 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 22:18:40 +00:00
Diego Biurrun
c55f606397
Remove cs_test and swscale-example on clean.
...
Originally committed as revision 20040 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 14:02:42 +00:00
Diego Biurrun
69402a1073
Remove redundant EXTRALIBS declaration.
...
Originally committed as revision 20039 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 14:00:14 +00:00
Diego Biurrun
7fe1cbd814
Simplify compilation call by using $(EXTRALIBS).
...
Originally committed as revision 20038 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 13:56:24 +00:00
Diego Biurrun
632d873994
Fix warnings:
...
swscale-example.c:87: warning: implicit declaration of function 'sws_format_name'
swscale-example.c:214: warning: implicit declaration of function 'sws_rgb2rgb_init'
Originally committed as revision 20037 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 13:54:56 +00:00
Diego Biurrun
b2c4e3547b
Fix warnings:
...
cs_test.c:62: warning: return type defaults to 'int'
cs_test.c:64: warning: implicit declaration of function 'memalign'
Originally committed as revision 20036 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 13:51:12 +00:00
Aurelien Jacobs
a90ce38634
make some global var static (fix a build failure with shared lib on x86_64)
...
Originally committed as revision 20024 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-03 23:51:32 +00:00
Diego Biurrun
f8d6112850
Fix unused variable warning when compiling with MMX disabled.
...
Originally committed as revision 20021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-03 17:11:43 +00:00
Diego Biurrun
0fe89aca42
Remove unused variables.
...
Originally committed as revision 20012 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-01 14:17:45 +00:00
Luca Abeni
44cdb42386
Add support for YUVJ formats
...
Originally committed as revision 19993 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-27 11:41:36 +00:00
Luca Abeni
87656472f4
Improve swscale-example to test conversions between all the possible
...
pixel formats
Originally committed as revision 19965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-24 09:55:18 +00:00
Luca Abeni
e9e12f0e11
Remove the dependency of libswscale on img_format.h
...
Originally committed as revision 19878 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-17 15:15:13 +00:00
Luca Abeni
5784b620d2
Fix the PIX_FMT_* ---> IMGFMT_* conversion (PIX_FMT_RGB32 is IMGFMT_BGR32)
...
Originally committed as revision 19875 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-17 14:59:55 +00:00
Diego Biurrun
2111440ae9
Add proper GPL headers.
...
Originally committed as revision 19772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-09 21:10:26 +00:00
Diego Biurrun
4fadc2b4f1
Add official GPL header to make license explicit as discussed on ffmpeg-devel.
...
Originally committed as revision 19709 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-06 10:24:19 +00:00
Víctor Paesa
22e4695905
Add sws_getCachedContext(), which checks if context is valid or reallocs a new one instead.
...
Patch by Victor Paesa <wzrlpy@arsystel.com>
Original thread:
Date: Aug 31, 2006 7:15 PM
Subject: [Ffmpeg-devel] [PATCH] Add sws_getCachedContext() to swscale library
Originally committed as revision 19667 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-04 09:38:24 +00:00
Michael Niedermayer
d1a7ae1a37
make the C code of the swscaler which i wrote LGPL
...
Originally committed as revision 19600 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-30 10:50:20 +00:00
Luca Abeni
7f3f497a0b
Allow to compile swscale tests
...
Originally committed as revision 19476 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-21 12:15:29 +00:00
Diego Biurrun
db3924f1fd
Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
...
Originally committed as revision 19437 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-18 13:58:03 +00:00
Diego Biurrun
751b900479
Move all internal -I parameters to the front of CFLAGS to avoid using external
...
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com
Originally committed as revision 19426 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-17 17:19:56 +00:00
Luca Abeni
1246640aa2
Fix compilation as a win32 shared library (libavutil must be explicitly linked)
...
Originally committed as revision 19416 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-16 20:09:47 +00:00
Uoti Urpala
91d0bda26d
Fix compilation with -no-PIC and without -fomit-frame-pointer (used by
...
--enable-debug).
Fix from Jason Tackaberry for his previous -fPIC patch.
Originally committed as revision 19406 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-15 14:50:24 +00:00
Jason Tackaberry
83c89c7885
-fPIC support for libswscale
...
patch by Jason Tackaberry, tack /at/ urandom /dot/ ca
Originally committed as revision 19402 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-15 08:47:03 +00:00
Diego Biurrun
4bff9ef9d0
Replace asmalign.h hack by ASMALIGN cpp macros from config.h.
...
Originally committed as revision 19378 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-13 00:21:14 +00:00
Uoti Urpala
17c613ef34
Use COMPILE_MMX2 instead of HAVE_MMX2 to determine whether to compile
...
MMX2 code, because the HAVE_ defines do not have sane values here if
runtime cpudetection is used. Hopefully fixes runtime cpudetection
breakage from r19339.
Originally committed as revision 19374 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-12 17:46:40 +00:00
Diego Biurrun
49a0122c99
Fix compilation with MMX disabled, the mmx_null and mmx_one constants don't need to
...
be protected by HAVE_MMX.
Originally committed as revision 19367 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-11 12:50:14 +00:00
Luca Abeni
c792037176
Another PIX_FMT_ ---> IMGFMT_ conversion
...
Originally committed as revision 19342 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-05 13:14:34 +00:00
Diego Biurrun
dbdae6ec54
Do not assemble MMX, MMX2 or 3DNOW code unconditionally on X86 and X86_64.
...
Originally committed as revision 19339 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-05 10:00:54 +00:00
Luca Abeni
80d0ded2f7
Add support for ffmpeg's pixel format names in libswscale
...
Originally committed as revision 19276 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-31 12:35:04 +00:00
Diego Biurrun
6979600818
Comment some #endif lines.
...
Originally committed as revision 19211 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-28 09:07:09 +00:00
Alan Curry
e50bc5a4ea
Fix compile error due to extra "FF" at beginning of file in the FF{MIN,MAX}
...
update
Originally committed as revision 19205 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-27 19:35:30 +00:00
Luca Abeni
6f209cb549
Replace MIN() and MAX() with FFMIN() and FFMAX()
...
Originally committed as revision 19186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-26 13:19:02 +00:00
Michael Niedermayer
8422aa888b
a tiny bit of cleanup
...
Originally committed as revision 19178 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-24 10:48:54 +00:00
Michael Niedermayer
bca11e75fb
vertical scaler with accurate rounding, some people on doom9 can see +-1 errors
...
the +-1 issue is limited to >2tap vertical filters, so bilinear upscale was unaffected
the new code is sometime faster sometimes slower but the difference is significant (~20%) so its optional and enabled with arnd=1
Originally committed as revision 19177 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-24 10:36:06 +00:00
Alan Curry
d8cfa5534a
Fix typo introduced in the memalign->av_malloc conversion (there is no
...
mv_malloc)
Originally committed as revision 19174 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-23 21:16:11 +00:00
Reimar Döffinger
8dfe90941a
Missing part of the malloc -> av_malloc patch: memalign must be replaced as well!
...
Originally committed as revision 19173 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-23 18:07:26 +00:00
Luca Abeni
94c4def23c
Use libavutil in libswscale, and allow it to be built out of the mplayer tree
...
Originally committed as revision 19148 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-20 12:13:57 +00:00
Luca Abeni
57b3c36d0f
make libswscale build system similar to the libav* one
...
Originally committed as revision 18994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-10 12:35:52 +00:00
Luca Abeni
2df19ea53a
Remove unneeded code
...
Originally committed as revision 18880 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-01 14:39:14 +00:00
Luca Abeni
73435f006b
Move postproc ---> libswscale
...
Originally committed as revision 18866 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-06-30 12:00:31 +00:00