Commit Graph

444 Commits

Author SHA1 Message Date
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
63d33cf439 bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
Originally committed as revision 4747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 11:31:56 +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
0f88407075 set pts for h.263 decoding
Originally committed as revision 4598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-19 12:03:51 +00:00
Diego Biurrun
344b825ceb Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
Originally committed as revision 4597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-18 21:21:01 +00:00
Michael Niedermayer
95ae72b7e0 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
Originally committed as revision 4540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-26 19:05:44 +00:00
Michael Niedermayer
5aa083eec1 A.B.C versions
Originally committed as revision 4486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-31 10:51:04 +00:00
Michael Niedermayer
e53222d19b try to check for nonsense time_base instead of setting fake one
Originally committed as revision 4485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-31 10:00:25 +00:00
Michael Niedermayer
efbc614de0 check time_base.den for mpeg4
avoid zero time_base.* for h263

Originally committed as revision 4483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-30 16:15:36 +00:00
Michael Niedermayer
91d44ffc9a fix user data parsing code so it suppors pre1 and cvs
Originally committed as revision 4471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-24 09:28:24 +00:00
Michael Niedermayer
d9dd7a0d2c minor user data reading bugfix
Originally committed as revision 4467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-23 11:16:18 +00:00
Diego Biurrun
bb628dae44 spelling fixes
patch by Peter Robinson pbrobinson @ at @ gmail . dot . com and myself

Originally committed as revision 4382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-17 15:02:53 +00:00
Michael Niedermayer
cf5c5c8f08 10l (%f vs. %Ld)
Originally committed as revision 4239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-13 23:11:32 +00:00
Michael Niedermayer
160147ccfc fixing decoding of AlanKay-245.asf
Originally committed as revision 4219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-11 17:13:42 +00:00
Michael Niedermayer
9cd8179818 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
Originally committed as revision 4205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-08 20:15:42 +00:00
Kevin Baragona
893bc62480 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
Originally committed as revision 4181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-05 14:34:47 +00:00
Michael Niedermayer
8b975b7ca5 put most codecs under ifdefs
Originally committed as revision 4173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-02 22:14:42 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer
dee6dde669 avoid unneeded clear_blocks()
Originally committed as revision 4157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-25 00:57:48 +00:00
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-24 17:21:11 +00:00
Michael Niedermayer
e91f4bf160 avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
Originally committed as revision 4137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-18 20:07:48 +00:00
Michael Niedermayer
59fa3f96f4 support omiting various headers in mpeg4 as WMP seems to have difficulty with them
based upon 27_WMP_compatibility_with_ISOMPEG4.patch by (Calcium | calcium nurs or jp)
  indention fixed
  uses workaround_bugs instead of strict_std_compliancy as WMP is not the reference implementation

Originally committed as revision 4069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 11:39:38 +00:00
Michael Niedermayer
c1e292ea91 fixing playback of xvid pretending to be divx (sample_vop_nc.avi)
Originally committed as revision 4021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-08 14:39:58 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Michael Niedermayer
3f26d68aec emulate (idiotic) MS behavior for inconsistant dimensions
Originally committed as revision 3940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-06 18:43:06 +00:00
Michael Niedermayer
1b781f82c9 support skiping some bitstream encoding
Originally committed as revision 3939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-06 17:01:07 +00:00
Michael Niedermayer
2c65638640 x86_64 pointer typecast fix by (Martin Drab <drab kepler.fjfi.cvut cz>)
Originally committed as revision 3845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-18 01:01:54 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:16:25 +00:00
Michael Niedermayer
85df8f7cf0 print "D" instead of "P" for dropable frames in flv with -debug 1
Originally committed as revision 3810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-06 01:02:36 +00:00
Michael Niedermayer
2d2651f821 WV1F support
Originally committed as revision 3790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-01 23:02:09 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-27 18:10:06 +00:00
Michael Niedermayer
40028f8f6e dont print "vop not coded" by default
Originally committed as revision 3523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 17:46:07 +00:00
Michael Niedermayer
15c5fa7b7f trellis quantization for h263(p)
Originally committed as revision 3503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-24 20:35:59 +00:00
Michael Niedermayer
9ebb8e1124 check if the user specified timestamps are strictly monotone
timestamp guess code 10l fix

Originally committed as revision 3483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-20 13:47:47 +00:00
Loren Merritt
952b32c0ad Always write VOL control parameters, needed by old xvid patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-03 02:32:39 +00:00
Michael Niedermayer
b1114f189d copy & paste bug
Originally committed as revision 3401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-18 22:10:39 +00:00
Michael Niedermayer
baced9f598 user overrideable level & profile
Originally committed as revision 3385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-13 13:59:28 +00:00
Michael Niedermayer
0ff93477be optimization
Originally committed as revision 3249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-25 14:11:44 +00:00
Michael Niedermayer
caacc47ff9 coefficient saturation fix
Originally committed as revision 3224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-14 23:41:41 +00:00
Michael Niedermayer
b876b5c5f7 10l (interlaced b frame decoding fix)
Originally committed as revision 3160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-26 19:42:00 +00:00
Michael Niedermayer
5e13a73006 motion estimation for SVQ1
Originally committed as revision 3126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-12 02:03:24 +00:00
Michael Niedermayer
4ccde216cd support decoding mpeg4 with buggy dc clipping
Originally committed as revision 3108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-05 19:53:40 +00:00
Michael Niedermayer
a7137a0452 mpeg4 dc prediction simplification
dc cliping fix

Originally committed as revision 3107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-05 00:14:22 +00:00
Michael Niedermayer
3116cb14d1 AMV bug workaround
Originally committed as revision 3099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-30 18:56:33 +00:00
Michael Niedermayer
ae4b7d5947 H.263 MCBPC fix
Originally committed as revision 3077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-26 21:46:01 +00:00
Michael Niedermayer
3c0da30c01 fix decoding with quant matrixes which contain elements <16
Originally committed as revision 3069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-25 19:03:35 +00:00
Michael Niedermayer
49f3806dd8 rv10 decoding fix
Originally committed as revision 3068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-25 16:14:13 +00:00
Michael Niedermayer
7c4f71c428 exporting field_select/ref_index values
Originally committed as revision 3035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-19 03:33:23 +00:00
Michael Niedermayer
14e2a9404e flv dropable p frame support
Originally committed as revision 3027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-17 13:36:21 +00:00
Michael Niedermayer
137c8468e8 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
minor +-1 bugfix

Originally committed as revision 3016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-16 01:01:45 +00:00
Michael Niedermayer
6c205de244 assert(time_incr >= 0) so its clear that this MUST be the case
Originally committed as revision 3010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-13 13:17:35 +00:00
Michael Niedermayer
3f9d89c696 gmc segfault fix
Originally committed as revision 2945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-02 16:21:55 +00:00
Michael Niedermayer
58c2182d72 fixing alignment, 2nd try
Originally committed as revision 2940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-29 00:29:27 +00:00
Michael Niedermayer
5cce4dd761 ensure that the bitstream buffers for encoding partitioned frames are aligned
Originally committed as revision 2935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 21:58:55 +00:00
Michael Niedermayer
204b5c9e08 h.263 ssm + aic fix by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
Originally committed as revision 2905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-18 22:45:37 +00:00
Michael Niedermayer
7813d6a307 1000000l (using uninitalized variable for initalizing bits per MV table)
Originally committed as revision 2900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-16 16:57:27 +00:00
Michael Niedermayer
b98202a438 mb stuffing in partitioned frames fix
Originally committed as revision 2869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-10 23:13:43 +00:00
Michael Niedermayer
b056e73c80 h263+ custom pcf support
Originally committed as revision 2868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-10 22:11:49 +00:00
Michael Niedermayer
e82d912dba h263 framerate & aspect ratio fixes
Originally committed as revision 2854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-06 12:33:56 +00:00
Michael Niedermayer
9740beffc6 use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
move AV_NOPTS_VALUE & AV_TIME_BASE from avformat.h -> avcodec.h
related fixes

Originally committed as revision 2814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-25 17:35:52 +00:00
Michael Niedermayer
e51f49487e set AVFrame.pts based upon framerate if its 0
detect & warn if the user prvides pts only for some frames, and try to guess the missing ones

Originally committed as revision 2812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-25 02:05:50 +00:00
Michael Niedermayer
9c3d33d67f multithreaded/SMP motion estimation
multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263
all pthread specific code is in pthread.c
to try it, run configure --enable-pthreads and ffmpeg ... -threads <num>
the internal thread API is a simple AVCodecContext.execute() callback which executes a given function pointer with different arguments and returns after finishing all, that way no mutexes or other thread-mess is needed outside pthread.c

Originally committed as revision 2772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-13 17:54:10 +00:00
Michael Niedermayer
8a36717afc rv10/obmc fixes
Originally committed as revision 2768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-09 15:23:35 +00:00
Michael Niedermayer
99683a3077 2 byte shorter userdata for mpeg4
in the past it was startcode,string,00,7F,startcode
now it is startcode,string,stratcode
both are mpeg4 compliant, as according to the standard the userdata lasts until the next 00 00 01 (startcode prefix) but some very primitive decoders which simply skip until the first 00 byte and then expect the next valid startcode might fail with the old variant, just a theory though (didnt test if quicktime can decode it now)

Originally committed as revision 2767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-08 22:52:35 +00:00
Michael Niedermayer
8cb5d4c060 h263 4mv encoding fix
Originally committed as revision 2755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-06 22:34:33 +00:00
Alex Beregszaszi
fe455f3328 get_bit_count -> put_bits_count
Originally committed as revision 2752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-06 15:27:31 +00:00
Michael Niedermayer
a62d75da98 segfault fix
Originally committed as revision 2737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-31 21:28:49 +00:00
Michael Niedermayer
6ff6cff203 first coded vs. first displayed pts (segfault & pts fix if b frames are used)
Originally committed as revision 2727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-27 13:55:34 +00:00
Michael Niedermayer
11a8a71d4e mpeg4 pts fix
Originally committed as revision 2724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-26 19:04:32 +00:00
Michael Niedermayer
65a24d0b39 optimization & bugfix extracted from the 4k line diff between ffmpeg 0.4.7 and http://www.alicestreet.com/ffh263.html
the other parts of the diff where
1. spelling fixes (rejected as only a small part of it could be applied automatically)
2. cosmetics (reindention, function reordering, var renaming, ...) with bugs (rejected)
3. rtp related stuff (rejetced as it breaks several codecs)
4. some changes to the intra/inter decission & scene change detection (quality tests needed first)

Originally committed as revision 2721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-24 23:47:33 +00:00
Michael Niedermayer
403f10996d more tolerance for dc=0
Originally committed as revision 2716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-21 19:14:26 +00:00
Michael Niedermayer
8f2ab83318 copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
Originally committed as revision 2686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-10 16:04:55 +00:00
Michael Niedermayer
bb198e198a interlaced motion estimation
interlaced mpeg2 encoding
  P & B frames
  rate distored interlaced mb decission
  alternate scantable support
4mv encoding fixes (thats also why the regression tests change)
passing height to most dsp functions
interlaced mpeg4 encoding (no direct mode MBs yet)
various related cleanups
disabled old motion estimaton algorithms (log, full, ...) they will either be fixed or removed

Originally committed as revision 2638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-30 16:07:57 +00:00
Michael Niedermayer
8135f8df52 rv20 / h263 b frame fix
Originally committed as revision 2628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-21 20:06:59 +00:00
Michael Niedermayer
fa75ce9292 fixing h263p encoding without UMV
Originally committed as revision 2598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-11 16:14:27 +00:00
Michael Niedermayer
feca25cc8b 100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l100l
Originally committed as revision 2582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-09 14:03:55 +00:00
Michael Niedermayer
0ed714a702 slice structured fixes
Originally committed as revision 2581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-09 13:47:08 +00:00
Wolfgang Hesseler
8d7ec294c4 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
cleanups & fixes by me

Originally committed as revision 2579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-09 01:49:56 +00:00
Michael Niedermayer
fb07988399 AIC/MQ encoding fix
Originally committed as revision 2573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-08 17:42:20 +00:00
Michael Niedermayer
ecfc44e66e alternative inter vlc encoding fix
Originally committed as revision 2570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-08 02:23:22 +00:00
Michael Niedermayer
ba58dabc5c h263 slice structured mode
slice cleanup

Originally committed as revision 2568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-07 01:33:45 +00:00
Michael Niedermayer
2be9f03abb AVFrame.interlaced_frame fixes
Originally committed as revision 2566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-05 01:03:12 +00:00
Michael Niedermayer
cdb4e730e4 cleanup
Originally committed as revision 2562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-04 18:46:49 +00:00
Michael Niedermayer
b40cd4e0e4 rv20 (h263) b frame decoding support
Originally committed as revision 2561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-04 18:34:47 +00:00
Michael Niedermayer
554daa2402 cleanup
Originally committed as revision 2558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-03 16:47:17 +00:00
Michael Niedermayer
fcfee63b12 split ff_h263_decode_mb() into h263 and mpeg4 versions
Originally committed as revision 2554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-03 01:16:35 +00:00
Michael Niedermayer
e1f03acc42 h263 MV prediction doesnt match mpeg4, for some slices configurations (fixes RV20 MVs)
Originally committed as revision 2551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-01 20:04:14 +00:00
Michael Niedermayer
332f9ac4e3 h263 loop filter
fixed h263 modified quantization
CODEC_FLAG_OBMC

Originally committed as revision 2549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-01 15:23:14 +00:00
Michael Niedermayer
43dc0bfd2e cleanup
Originally committed as revision 2545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-30 17:30:18 +00:00
Michael Niedermayer
68b94c354d rv20 decoder
Originally committed as revision 2543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-30 14:35:35 +00:00
Michael Niedermayer
dba019daba h263 alternative inter vlc support
Originally committed as revision 2541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-29 08:37:51 +00:00
Michael Niedermayer
f7190f7399 h263 OBMC & 4MV support
cleanup

Originally committed as revision 2536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-28 21:31:20 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 13:26:22 +00:00
Michael Niedermayer
5f1948111a pts fix and related fixes
Originally committed as revision 2452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-30 16:58:49 +00:00
Michael Niedermayer
9df1d2490d dumping funny numbers from first zygo i frame header
Originally committed as revision 2450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-29 17:30:13 +00:00
Alex Beregszaszi
43a13e7247 initial support for zygovideo
Originally committed as revision 2449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-29 14:54:45 +00:00
Michael Niedermayer
5ff85f1d8b AVRational
sample_aspect_ratio
aspect ratio in JPEG JFIF is SAR not DAR !
removed nonsense SAR guessing code
various related cleanups
bugs?

Originally committed as revision 2403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-20 20:23:46 +00:00
Michael Niedermayer
a573cc27f5 emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
Originally committed as revision 2395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-17 18:56:01 +00:00
Michael Niedermayer
ac0c66382d dont check if the ac esc 3 could have been stored as vlc as this detects only very few errors allthough it detects several buggy encoders
Originally committed as revision 2370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-13 11:13:10 +00:00
Alex Beregszaszi
ed7debda14 removed the obsolete and unused parameters of init_put_bits
Originally committed as revision 2366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-12 21:25:00 +00:00
Michael Niedermayer
bba3a09bb0 h263 GOB decoding fix
Originally committed as revision 2364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-12 19:18:37 +00:00
Michael Niedermayer
34790165dc intra dc treshold != 0 decoding fixed
Originally committed as revision 2363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-12 14:01:53 +00:00
Michael Niedermayer
11417deff9 recommit of
VOL != 0x120 support

Originally committed as revision 2355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-11 08:27:07 +00:00
Michael Niedermayer
158c7f059c use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
quality which was 1..31 float is now a 1..FF_LAMBDA_MAX int, and FF_QP2LAMBDA * qp can be used to convert to the new range

Originally committed as revision 2348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-07 11:32:40 +00:00
Michael Niedermayer
8d8c02942b ac prediction cleanup
rate distorted optimal ac prediction for mpeg4

Originally committed as revision 2325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-01 15:41:36 +00:00
Michael Niedermayer
f2f6134b9e rate distortion optimal cbp support (h263/mpeg4 non intra only)
Originally committed as revision 2323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-30 22:18:43 +00:00
Michael Niedermayer
8b76418a14 100l
Originally committed as revision 2305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-27 00:01:46 +00:00
Michael Niedermayer
7af75e6c65 h263 stuffing decode fix
Originally committed as revision 2304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-26 22:18:25 +00:00
Michael Niedermayer
8fc6c2b537 detect old xvid with fourcc=DIVX
remove "this file was encoded with ..." stuff (use debug=4096 if u want to know that)

Originally committed as revision 2253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 11:28:18 +00:00
Michael Niedermayer
22ddd60bc2 fixing CODEC_FLAG_GLOBAL_HEADER
Originally committed as revision 2167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-26 20:14:28 +00:00
Fabrice Bellard
802f454e5b removed unused variable
Originally committed as revision 2162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 22:28:41 +00:00
Michael Niedermayer
d6eb3c500a custom quant matrix encoding support
Originally committed as revision 2135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-22 22:18:08 +00:00
Michael Niedermayer
59c673d518 cleanup / fixes
Originally committed as revision 2103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-05 10:19:43 +00:00
Michael Niedermayer
ffba1dc02b make the h263 decoder more error tolerant
Originally committed as revision 2099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-01 11:00:03 +00:00
Michael Niedermayer
f5ea4461ce patch for flv deblocking by (Garrick Meeker <gmeeker at theoryllc dot com>)
Originally committed as revision 2095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-29 09:58:47 +00:00
Michael Niedermayer
7d1c3fc1d6 rate distortion mb decision support
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c

Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-29 02:09:12 +00:00
Michael Niedermayer
6674a12696 fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
note, encoding wasnt affected by that

Originally committed as revision 2052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-16 18:12:14 +00:00
Michael Niedermayer
e11530e780 flv1 fix
Originally committed as revision 2047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 20:22:22 +00:00
Michael Niedermayer
e4748d63ea fix? flv escape codes
Originally committed as revision 2029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 10:24:47 +00:00
Michael Niedermayer
44a2950f72 flv cleanup / simplify
Originally committed as revision 2026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 00:15:27 +00:00
Garrick Meeker
d4f5d74a54 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
Originally committed as revision 2024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-09 23:10:59 +00:00
Michael Niedermayer
3f6f76afef the reference sw doesnt like some legal headers ...
Originally committed as revision 2020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-07 20:17:44 +00:00
Michael Niedermayer
e056044824 CODEC_FLAG_LOW_DELAY fix
Originally committed as revision 2016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-06 21:24:04 +00:00
Michael Niedermayer
d07f90433a truncated h263 decoding support / H263-ES "demuxer"
Originally committed as revision 1898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-22 14:12:22 +00:00
Michael Niedermayer
3d2e8cce3a ASV1 codec
with postprocessing support :)

Originally committed as revision 1891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-19 13:30:59 +00:00
Michael Niedermayer
6d71b38207 improving 3IV1 support (still far from perfect) note, disabled as it requires some checks in the inner loops which would slow things down a tiny bit
Originally committed as revision 1889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-18 00:07:17 +00:00
BERO
d4961b3523 fastdiv patch by (BERO <bero at geocities dot co dot jp>) with fixes & cleanup by me
Originally committed as revision 1879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-14 15:12:13 +00:00
Michael Niedermayer
17fb5fd34e libmpeg2 style bitstream reader fixes
Originally committed as revision 1875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-14 10:55:59 +00:00
BERO
05858889b2 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
Originally committed as revision 1872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-14 01:08:02 +00:00
BERO
d8e00c0997 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
Originally committed as revision 1871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-14 00:32:22 +00:00
Michael Niedermayer
85ea6b2958 print obmc bug info only if avctx->debug&1
Originally committed as revision 1848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-10 21:35:29 +00:00
Michael Niedermayer
7bc9090a41 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
more direct use of the new mb_type stuff instead of codec specific stuff
runtime mb_type debug output h264/h263 variants/mpeg1/2/4
error concealment /resilience for mpeg1/2
various minor optimizations

Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-10 13:18:38 +00:00
Michael Niedermayer
84876d3677 b frames + slices bugfix
Originally committed as revision 1745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-10 08:47:08 +00:00
Michael Niedermayer
4d2a48349d msmpeg4 2pass support & some related cleanup
Originally committed as revision 1724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-02 09:57:34 +00:00
Michael Niedermayer
309522372c some static -> dynamic alloc & 16->8 bit
Originally committed as revision 1722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-31 11:13:14 +00:00
Michael Niedermayer
1984f6359e user setable quantizer bias
Originally committed as revision 1701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-22 12:09:02 +00:00
Michael Niedermayer
d5a2117228 better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
Originally committed as revision 1695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-20 17:52:30 +00:00
Michael Niedermayer
46b4feec06 error resilience cleanup (its faster too...)
Originally committed as revision 1692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-20 01:00:57 +00:00
Michael Niedermayer
1c6dcb0f42 cleaner & more flexible edge bug workaround
Originally committed as revision 1685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-15 20:47:09 +00:00
Michael Niedermayer
e13f860ac8 oops
Originally committed as revision 1679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 23:12:23 +00:00
Michael Niedermayer
a4e8b58761 rvlc decoding support
Originally committed as revision 1678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 23:09:18 +00:00
Michael Niedermayer
14bea432f1 per context frame_rate_base, this should finally fix frame_rate related av sync issues
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 15:16:19 +00:00
Alex Beregszaszi
ce2749d2c4 simplified
Originally committed as revision 1655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-09 16:07:19 +00:00
Michael Niedermayer
983e3246b7 per file doxy
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-06 11:32:04 +00:00
Michael Niedermayer
b0368839ac MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
bitexact cleanup

Originally committed as revision 1617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-03 14:54:00 +00:00
Michael Niedermayer
179386025e 10l
Originally committed as revision 1615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-28 16:06:40 +00:00
Michael Niedermayer
e51d6d27a6 h263(+) clenaup & bugfixes
Originally committed as revision 1614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-28 13:07:07 +00:00
Wolfgang Hesseler
7604246d1a more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
Originally committed as revision 1588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-16 23:05:38 +00:00
Michael Niedermayer
7d67e968a4 improving parsing of incomplete headers
Originally committed as revision 1585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-14 01:47:10 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Zdenek Kabelac
5c91a6755b * static,const,compiler warning cleanup
Originally committed as revision 1567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-10 09:35:32 +00:00
Michael Niedermayer
c40c34828a direct blocksize in bframes fix (might fix qpel+bframe bug)
Originally committed as revision 1557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-08 18:23:39 +00:00
Michael Niedermayer
1d0d55daf4 --disable-risky support
Originally committed as revision 1522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-29 12:00:11 +00:00
Michael Niedermayer
2ba8f6b817 feeding doxygen
Originally committed as revision 1511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-26 23:09:12 +00:00
Michael Niedermayer
68f593b484 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
Originally committed as revision 1486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-21 17:34:12 +00:00
Michael Niedermayer
6772518310 finetuneing thresholds/factors
nicer mb decission
a few minor improvements & fixes

Originally committed as revision 1472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-19 17:55:13 +00:00
Michael Niedermayer
0e15384d9d fixing DCTELEM != short
Originally committed as revision 1462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-15 19:21:21 +00:00
Michael Niedermayer
9214855006 average motion vector rounding like the reference says and not what the standard says
Originally committed as revision 1453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-12 12:16:36 +00:00
Michael Niedermayer
70ac76c0eb mpeg4 header encoding bugfix
Originally committed as revision 1392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-03 23:21:52 +00:00
Michael Niedermayer
477ab036ad trellis quantization
Originally committed as revision 1380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-31 17:23:56 +00:00
Michael Niedermayer
41773b735e correcter mpeg4 headers
Originally committed as revision 1376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-30 00:28:42 +00:00
Michael Niedermayer
1457ab5233 qpel encoding
4mv+b frames encoding finally fixed
chroma ME
5 comparission functions for ME
b frame encoding speedup
wmv2 codec (unfinished)
user specified diamond size for EPZS

Originally committed as revision 1365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-27 23:51:46 +00:00
Michael Niedermayer
59b571c1e4 more debug output
Originally committed as revision 1338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-17 11:25:29 +00:00
Michael Niedermayer
f8af5cb5a4 correct mpeg4 vo type
Originally committed as revision 1324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-09 00:06:15 +00:00
Michael Niedermayer
2b2719acff ump4 decoding fixed
Originally committed as revision 1322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-07 11:38:26 +00:00
Michael Niedermayer
c8c437bc23 specific debug output support
Originally committed as revision 1305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 12:09:27 +00:00
Michael Niedermayer
ce3bcaeda1 fixing illegal 3. esc bug (the mpeg4 std only requires encoders to use unescaped symbols but not esc1 or esc2 if they are shorter than esc3, andjust beause its logical to use the shortest possible vlc doesnt mean encoders do that)
Originally committed as revision 1304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 11:47:24 +00:00
Michael Niedermayer
1e491e29c2 cleanup
adding AVVideoFrame
 moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
 removing obsolete variables in AVCodecContext
 skiping of MBs in b frames
 correctly initalizing AVCodecContext
 picture buffer cleanup

Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 10:04:03 +00:00
Michael Niedermayer
e4828c7d43 fixing h263+ slices if the padding at the end of the frame is >7 && <16 && there are no zero bytes afterwards
Originally committed as revision 1281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-26 08:56:10 +00:00
Michael Niedermayer
58b0b0dd93 fixing aspect
Originally committed as revision 1273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-25 09:23:19 +00:00
Michael Niedermayer
5d3cea3a86 aspect ratio cleanup
Originally committed as revision 1254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-20 13:08:04 +00:00
Zdenek Kabelac
eb4b3dd3c3 * using DSPContext - so each codec could use its local (sub)set of CPU extension
Originally committed as revision 1194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-11 09:40:17 +00:00
Michael Niedermayer
b8a78f419d reversing header game
MIN/MAX -> FFMIN/FFMAX

Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-10 11:46:59 +00:00
Michael Niedermayer
f56dd362bd hopefully fixing sprite_warping_points==0
Originally committed as revision 1136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-01 13:25:22 +00:00
Michael Niedermayer
bbed9259cc put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
Originally committed as revision 1130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-31 16:11:03 +00:00
Jürgen Keil
384855eebf segfault fix patch by (Juergen Keil <jk at tools dot de>)
Originally committed as revision 1073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-26 18:56:43 +00:00
Michael Niedermayer
945eeee15e slice encoding cleanup
Originally committed as revision 1069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-25 00:08:32 +00:00
Michael Niedermayer
7da71a5c68 xvid qpel bug autodetect
Originally committed as revision 1064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-22 19:48:52 +00:00
Michael Niedermayer
49943a18d0 fixing interlaced dct with 4mv
Originally committed as revision 1050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-19 11:03:13 +00:00
Michael Niedermayer
073b013d00 complete mpeg4 GMC decoding support
Originally committed as revision 1046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-16 19:55:49 +00:00
Michael Niedermayer
d2975f8d4f warning fixes
Originally committed as revision 1044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-15 15:24:08 +00:00
Michael Niedermayer
b704e7420b mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
Originally committed as revision 1032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-14 12:21:54 +00:00
Michael Niedermayer
4d2858deac better/cleaner error resilience (done in a 2nd pass after decoding)
h263/mpeg4 out of order slice decoding

Originally committed as revision 1030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-13 13:16:04 +00:00
Michael Niedermayer
3a3d3a42c2 fixing custom quantizer matrix decoding
minor optimizations

Originally committed as revision 993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-02 22:56:58 +00:00
Michael Niedermayer
2ad1516a6c idct permutation cleanup, idct can be selected per context now
fixing some threadunsafe code

Originally committed as revision 980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-29 22:44:22 +00:00
Michael Niedermayer
a9c6830605 minor optimization of h263_encode_motion()
Originally committed as revision 976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-27 15:38:54 +00:00
Michael Niedermayer
202ef8b819 ff_get_fourcc() & XVIX support
Originally committed as revision 975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-27 10:27:57 +00:00
Michael Niedermayer
0c2dd16eb6 autodetect UMP4 (by adding a fourcc field to AVCodecContext)
Originally committed as revision 974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-26 23:27:22 +00:00
Michael Niedermayer
7f2bdb62d4 automatically detect broken opendivx codec and workaround, so bug=1 shouldnt be needed anymore for mpeg4 files, if there still are files which need bug=1 then tell me ...
Originally committed as revision 973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-26 22:37:33 +00:00
Michael Niedermayer
5482970b4b h263_dc_scale() cleanup
Originally committed as revision 972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-26 09:16:23 +00:00
Michael Niedermayer
fcb48651f4 mpeg4 interlaced dct encoding
Originally committed as revision 971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-26 00:22:25 +00:00
Michael Niedermayer
9e4c69485b adaptive quantization for h263
Originally committed as revision 969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-24 15:07:44 +00:00
Michael Niedermayer
9960903667 fixing ac prediction encoding with adaptive quantization
Originally committed as revision 966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-24 09:15:46 +00:00
Michael Niedermayer
c5d309f2d5 adaptive quantization (lumi/temporal & spatial complexity masking)
Originally committed as revision 964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-23 14:56:11 +00:00
Michael Niedermayer
5596c60cce dont store version for bit-exact tests
Originally committed as revision 948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-14 22:07:35 +00:00
Michael Niedermayer
a172cae62e interlaced b frames fix
Originally committed as revision 946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-14 17:18:26 +00:00
Alex Beregszaszi
050fe8bab5 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
Originally committed as revision 941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-13 19:31:32 +00:00
Michael Niedermayer
e3bd83f874 10l (field select readed at the wrong place ...)
Originally committed as revision 939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-13 11:47:57 +00:00
Michael Niedermayer
fc97db6435 interlaced b frames cleanup
Originally committed as revision 938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-13 11:24:58 +00:00
Michael Niedermayer
bea669e57c interlaced mpeg4 b frame decoding
Originally committed as revision 936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-13 09:45:32 +00:00