generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,092 Commits 24 Branches 241 Tags 173 MiB
41b7389cad
Commit Graph

757 Commits

Author SHA1 Message Date
Michael Niedermayer
82fcbc145d faster find_startcode() 
Originally committed as revision 4939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 20:32:02 +00:00
Loren Merritt
fdb52bccf6 fix crash on height < 16 pixels. 
Originally committed as revision 4904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-28 00:57:59 +00:00
Corey Hickey
7e41c35436 Add a newline to b_frame_strategy error message. 
Originally committed as revision 4903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-27 23:24:24 +00:00
Michael Niedermayer
07fc2b8278 fixing bframe strategy 2 
bits vs. bytes factor of 8 error
  16 byte offset error
  some other minor things

Originally committed as revision 4902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-27 13:19:13 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Tom Joseph
ee0d2803ec H.263: more descriptive error message 
patch by Tom Joseph < tom-lists @@ @ @@ jambon @@ dot @@ ll @@ dot @@ cx >

Originally committed as revision 4812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-04 17:07:30 +00:00
Michael Niedermayer
88e51e1fb5 second try of improved lambda/qp guessing for motion estimation RD in first pass 
Originally committed as revision 4785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-29 15:46:23 +00:00
Michael Niedermayer
e8501c93b5 support downscaling frames for dynamic b frame decission 
Originally committed as revision 4776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-25 18:34:02 +00:00
Michael Niedermayer
984b8e4de1 b frame strategy 2 
Originally committed as revision 4774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-25 17:30:52 +00:00
Michael Niedermayer
82b019cefd better f_code guessing in 2nd pass 
Originally committed as revision 4766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 22:48:09 +00:00
Michael Niedermayer
50c6f6cd4c improved lambda/qp guessing for motion estimation RD in first pass 
this only affects encoding with bframes and rate control

Originally committed as revision 4765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 14:17:54 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Michael Niedermayer
8ed9f9ab32 use correct qp & lambda for ME on the second pass 
Originally committed as revision 4757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-19 13:41:27 +00:00
Michael Niedermayer
2ceff404b5 forgot 
Originally committed as revision 4756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-19 03:08:08 +00:00
Michael Niedermayer
71160c55e0 fix q=0 bug 
Originally committed as revision 4754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-18 19:59:33 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
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
60d76256cb psnr calculation with threads>1 fix 
Originally committed as revision 4725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-07 18:21:16 +00:00
Michael Niedermayer
a75a3ca429 frame skip fixes 
fix 16pixel error in comparission
 fix vbv messup
 fix unlimited skip intervals, limited by GOP now

Originally committed as revision 4678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-05 00:16:03 +00:00
Måns Rullgård
bf4e3bd2d0 kill a bunch of compiler warnings 
Originally committed as revision 4522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-14 15:42:40 +00:00
Martin Boehme
acb22f9391 Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de) 
this integer overflow might lead to the execution of arbitrary code during encoding with threads

Originally committed as revision 4474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-25 23:07:27 +00:00
Michael Niedermayer
8c3eba7c62 skip_idct 
skip_frame
skip_loop_filter

Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-14 21:39:36 +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
ded8477def fix max b frames with b frame strategy 1 
Originally committed as revision 4300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-21 22:20:26 +00:00
Måns Rullgård
30344a83e0 remove/replace non-ascii characters 
Originally committed as revision 4237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-13 21:04:16 +00:00
Michael Niedermayer
bf873ee62a b_frame_strategy sanity check 
Originally committed as revision 4222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-12 01:31:11 +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
Michael Niedermayer
6b51185c63 overflow fix 
Originally committed as revision 4201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 09:58:41 +00:00
Michael Niedermayer
1192ce3707 complain about mpeg4 limits only if codec_id == MPEG4 
Originally committed as revision 4200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 00:44:06 +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
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
Kevin Baragona
dfb706da4d Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com) 
Originally committed as revision 4151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 11:13:49 +00:00
Michael Niedermayer
ee572c5482 remove duplicate clip to 8bit function 
Originally committed as revision 4143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-20 10:05:15 +00:00
Mike Melanson
6f921f3100 remove superfluous CONFIG_ENCODERS (entire function is already wrapped) 
Originally committed as revision 4139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-19 04:29:11 +00:00
Michael Niedermayer
09c3e44e8a motion estimation bitrate penalty compensation 
Originally committed as revision 4092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-27 12:19:59 +00:00
Michael Niedermayer
cec1f05fd7 check mb/me_threshold range, fixes assertion failure 
Originally committed as revision 4082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-26 18:10:44 +00:00
Michael Niedermayer
02dc898338 alignment fix 
Originally committed as revision 4059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-19 13:10:09 +00:00
Michael Niedermayer
40c5fa2689 AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>) 
with minor changes from me

Originally committed as revision 4019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-06 23:20:53 +00:00
Loren Merritt
2f944356bf H.264: decode arbitrary frame orders and allow B-frames as references. 
Originally committed as revision 4003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-04 12:47:38 +00:00
Loren Merritt
e21f398378 vismb: display 4x4 partition boundaries in H.264 
Originally committed as revision 3999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-03 06:57:17 +00:00
Michael Niedermayer
8dd2a893dd set supported pix_fmts 
Originally committed as revision 3982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-25 15:06:21 +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
Josh Varner
fe533bb3a7 removing --disable-risky patch by (Josh Varner <jlvarner gmail com>) 
Originally committed as revision 3966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-21 17:50:48 +00:00
Christophe Massiot
957c743a23 Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr) 
Originally committed as revision 3927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 18:49:04 +00:00
Johan Bilien
ebaa7e0315 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr) 
Originally committed as revision 3926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 18:14:59 +00:00
Michael Niedermayer
e8ea90123d framerate check 
Originally committed as revision 3869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 14:07:25 +00:00
Michael Niedermayer
dd4f8a04fe jpeg style yuv fixes 
Originally committed as revision 3852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-20 00:30:20 +00:00
Michael Niedermayer
a9c3ff5b9e assertion about bits statistic and minor bits stat fix 
Originally committed as revision 3835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-14 23:48:12 +00:00
Michael Niedermayer
30231f8169 10l (dont modify the input picture pts) 
Originally committed as revision 3833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-13 11:59:19 +00:00
Kurosu
f41c1fac3c av_malloc vs av_mallocz patch by (Kurosu <kurosu inforezo org>) 
Originally committed as revision 3830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 18:25:48 +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
eaba7c7fd6 picture heap corruption fix 
Originally committed as revision 3819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-10 23:41:25 +00:00
Loren Merritt
650cec0c8c vismv for h264 displayed incorrect motion vectors. 
Originally committed as revision 3765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-20 03:03:37 +00:00
Michael Niedermayer
3c9ec07ef2 quantizer overflow warning + AAN dct fix 
Originally committed as revision 3754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-14 20:17:23 +00:00
Michael Niedermayer
732ce18eab warn the user if the quantization code could overflow with the selected custom matrix and qp limits 
Originally committed as revision 3747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-11 18:33:18 +00:00
Michael Niedermayer
0fd6aea1f1 more flexible frame skip decission 
Originally committed as revision 3743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 18:02:56 +00:00
Michael Niedermayer
bbf18b21b7 frame skip support 
Originally committed as revision 3742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 11:46:16 +00:00
Michael Niedermayer
d0271e8a3a rv20 encoding 
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-07 13:14:37 +00:00
Michael Niedermayer
6989963c1f 10l (dont use codec_id for error simulation) 
Originally committed as revision 3718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-28 14:58:50 +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
6db2583c4f check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there 
Originally committed as revision 3708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-24 00:15:49 +00:00
Loren Merritt
80516d720a Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>) 
Originally committed as revision 3707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-23 23:58:54 +00:00
Maarten Daniels
ccff9da62a H261 fixing and cleaning: 
-corrected wrong value in mv data
 -set correct mb_type after adjusting index
 -don't use H263 loop filter when the loop filter flag is set but when
  using the H261 encoder
 -use the same unquantizer as H263 (which is optimized btw)
 -removed unused members in H261Context
patch by (Maarten Daniels <maarten.daniels >at< luc >dot< ac >dot< be>)

regression test checksum update by me

Originally committed as revision 3669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-12 01:21:34 +00:00
Michael Niedermayer
1c3990dbba H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>) 
Originally committed as revision 3643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-28 10:12:57 +00:00
Michael Niedermayer
035817727f support strictly enforcing gop size 
Originally committed as revision 3594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-15 02:37:04 +00:00
Michael Niedermayer
9efc77c86f fix forcing of individual frame types 
Originally committed as revision 3593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-14 12:24:16 +00:00
Michael Niedermayer
ac8b03c0a8 lowres 4mv 
Originally committed as revision 3576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-09 12:02:19 +00:00
Michael Niedermayer
5f6c92d40c h.261 loop filter fix 
closes bug #1033108

Originally committed as revision 3574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-08 22:57:39 +00:00
Milan Cutka
125af02243 Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>) 
Originally committed as revision 3571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-08 10:37:45 +00:00
Michael Niedermayer
4f8a831994 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0) 
Originally committed as revision 3518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-27 02:39:55 +00:00
Michael Niedermayer
718455951c lowres chroma fix 
Originally committed as revision 3517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 23:01:42 +00:00
Michael Niedermayer
0f74857497 lowres slice fix 
Originally committed as revision 3516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 21:28:31 +00:00
Michael Niedermayer
da9c9637ae low resolution interlaced support 
Originally committed as revision 3512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 11:05:35 +00:00
Michael Niedermayer
178fcca848 1/2 resolution decoding 
Originally committed as revision 3507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-25 23:18:58 +00:00
Michael Niedermayer
3c00436b3e 100l 
Originally committed as revision 3501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-24 17:30:04 +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
1140139fe2 10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>) 
Originally committed as revision 3471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-16 17:36:39 +00:00
Michael Niedermayer
b100eab869 changing size segfault fix 
Originally committed as revision 3463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-15 00:35:18 +00:00
Michael Niedermayer
d32064c0f7 comment fix 
Originally committed as revision 3462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-14 18:35:03 +00:00
Michael Niedermayer
2d3601b564 qprd + mpeg2 segfault fix 
Originally committed as revision 3461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-14 17:17:12 +00:00
Michael Niedermayer
7b37a6e984 10l (wrong coded_picture) 
Originally committed as revision 3441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-08 10:07:08 +00:00
Michael Niedermayer
1765920791 minor optimization 
Originally committed as revision 3386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-13 14:40:33 +00:00
Michael Niedermayer
1477ec35dd 10l (dont store 2 different things at the same place ...) 
Originally committed as revision 3380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-11 19:32:34 +00:00
Christophe Massiot
f1dc14a9fa miscalculation of header_bits when using the -thread option bugfix, patch by (Christophe Massiot <cmassiot at freebox dot fr>) 
Originally committed as revision 3329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-20 17:13:08 +00:00
Michael Niedermayer
77e6c403e7 10l (fixes delayed frames during encoding) 
Originally committed as revision 3278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 23:12:21 +00:00
Ivan Kalvachev
ffdff4d7e8 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs 
Originally committed as revision 3215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-11 07:59:12 +00:00
Michael Niedermayer
d4c5d2adf3 nsse weight 
Originally committed as revision 3205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-07 17:30:02 +00:00
Michael Niedermayer
e6a2ac3474 noise preserving sum of squares comparission function 
Originally committed as revision 3204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-07 03:23:31 +00:00
Michael Niedermayer
23854cadec sanity checks 
Originally committed as revision 3202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-06 19:44:05 +00:00
Michael Niedermayer
a1e07d39be qscale + qprd fix 
Originally committed as revision 3192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-05 18:10:23 +00:00
Michael Niedermayer
0e9d4a67f4 change qscale -> lambda for the motion estimation 
finetune bit/distortion weighting factor used in motion estimation, the old coeffs where finetuned relative to incorrect mv_penalty tables which where then fixed later but the coeffs where not
this _may_ fix the long standing blocking artifacts, but may also introduce mudding artefacts theoretically, so please tell us if u stumble across any so we can either fix them or export this variable so the user can change it

Originally committed as revision 3189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-03 19:29:47 +00:00
Michael Niedermayer
bb8140f29d h261 dequant fix 
Originally committed as revision 3180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-31 00:42:55 +00:00
Michael Niedermayer
c6148de232 h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>) 
Originally committed as revision 3176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-30 20:37:15 +00:00
Michael Niedermayer
5751815562 export low_delay for encoding too 
Originally committed as revision 3170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 15:16:52 +00:00
Chris Flerackers
a7fcb3ea5c rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>) 
Originally committed as revision 3141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:23:49 +00:00
Michael Niedermayer
e96682e6f4 some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:09:46 +00:00
Michael Niedermayer
1f202b0d46 moving motion estimation specific variables from MpegEncContext -> MotionEstContext 
Originally committed as revision 3124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-11 01:38:46 +00:00
Michael Niedermayer
eea8c08fa8 cleanup & memleak fix 
Originally committed as revision 3095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 17:42:58 +00:00
Michael Niedermayer
bf266e195a intra_dc_precission>0 encoding support 
Originally committed as revision 3093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 13:44:29 +00:00
Michael Niedermayer
844ce49d12 10l 
Originally committed as revision 3090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 01:35:45 +00:00
Michael Niedermayer
000a9c02db 10l 
Originally committed as revision 3088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-29 22:12:29 +00:00
Michael Niedermayer
e4cb187db8 remove duplicated find_frame_end() code 
move codec specific code from parser.c -> <codecname>.c as far as its easily possible

Originally committed as revision 3087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-29 14:21:33 +00:00
Michael Niedermayer
9964df63ee minor motion estimation cleanup 
4mv motion vector passthrough

Originally committed as revision 3051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-24 03:36:37 +00:00
Michael Niedermayer
1671083f55 sanity check 
Originally committed as revision 3047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 21:17:31 +00:00
Michael Niedermayer
f4f3223ffd reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold 
currently works only with mpeg1/2 source or some luck
may need -sync 0 as otherwise framedrops could lead to extreemly long b frame sequences

Originally committed as revision 3042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 19:06:30 +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
3803021453 fix y scale of mv vissualization of interlaced MVs 
Originally committed as revision 3033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-18 18:30:05 +00:00
Michael Niedermayer
a4d36c1113 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder 
moving ref_index from Picture to AVFrame

Originally committed as revision 3028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 19:41:49 +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
8100cab9c6 nicer looking arrows for the motion vector vissualization 
Originally committed as revision 2950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-03 01:55:24 +00:00
Michael Niedermayer
b44bdf7eec interlaced chroma MC divx-bug workaround 
Originally committed as revision 2947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-02 19:54:33 +00:00
Michael Niedermayer
b73afeac30 huge vbv buffer size + CBR fix 
Originally committed as revision 2929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-26 12:30:04 +00:00
Falk Hüffner
7906085fcc warning patrol 
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-24 23:32:48 +00:00
Michael Niedermayer
6b47b7300e Compile fix by (Chip <szarlada at freemail dot hu>) 
Originally committed as revision 2915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-22 12:07:02 +00:00
Michael Niedermayer
7976241aef moving f/b_code init to where it should be 
Originally committed as revision 2901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-16 17:27:03 +00:00
Michael Niedermayer
3edcacde04 init cleanup 
Originally committed as revision 2899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-16 16:11:29 +00:00
Michael Niedermayer
37923cd32d alignment fix 
Originally committed as revision 2890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 17:55:50 +00:00
Michael Niedermayer
67086c8552 width,height%16!=0 fix 
Originally committed as revision 2889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 17:33:48 +00:00
Michael Niedermayer
1da57984e6 10l 
Originally committed as revision 2871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-11 13:22:39 +00:00
Michael Niedermayer
ca5b9f20b2 10l 
Originally committed as revision 2848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-05 15:10:56 +00:00
Michael Niedermayer
ed263031f6 100l (divx5 b frame + seeking + flush fix) 
Originally committed as revision 2836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-02 03:18:03 +00:00
Ivan Kalvachev
5e5c247a7c initial chroma_format changes,xvmc tweaks and codec_cap 
Originally committed as revision 2833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-01 14:55:21 +00:00
Michael Niedermayer
95d356c587 optimizing/cleanup of mpeg/qpel_motion() 
Originally committed as revision 2831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 22:14:46 +00:00
Michael Niedermayer
c8a4ebbf27 simplify MPV_motion() 
Originally committed as revision 2828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 02:08:28 +00:00
Michael Niedermayer
5ba326b5d4 interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi) 
related cleanup

Originally committed as revision 2827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 00:37:36 +00:00
Michael Niedermayer
259630df42 10l (vdpart fix) 
Originally committed as revision 2822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-26 19:11:21 +00:00
Michael Niedermayer
ae35f5e14e 100l (field picture decoding fix) 
Originally committed as revision 2818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-26 02:48:07 +00:00
Wolfgang Hesseler
8289c6faa8 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>) 
Originally committed as revision 2816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-25 18:29:17 +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
c62c07d3d7 multithreaded mpeg2 decoding 
Originally committed as revision 2810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-23 20:56:56 +00:00
Michael Niedermayer
5e7c25f0d1 simplify 
Originally committed as revision 2801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-18 22:54:02 +00:00
Michael Niedermayer
fbf2284cd2 check if threads_count is too large 
Originally committed as revision 2798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-18 16:26:16 +00:00
Michael Niedermayer
da16b2043f noise reduction with threads bugfix 
Originally committed as revision 2789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-17 18:57:50 +00:00
Michael Niedermayer
fafbc7c8c8 mpeg4 b frame + adaptive quantization assertion failure fix 
Originally committed as revision 2779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 03:49:43 +00:00
Michael Niedermayer
3a1fa44759 multithreaded spatial complexity calculation for i frames 
Originally committed as revision 2778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 03:21:03 +00:00
Michael Niedermayer
b6335c9f5b ff_copy_bits() optimization 
Originally committed as revision 2777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 01:25:41 +00:00
Michael Niedermayer
a734250db6 activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr() 
Originally committed as revision 2775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-13 21:07:31 +00:00
Michael Niedermayer
cfbd16df75 replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong 
Originally committed as revision 2774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-13 20:59:48 +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
Tinic Uro
747a0554ea - made --extra-cflags option work on darwin 
- allow INTER4V macroblocks for FLV1 codec
- fixed issue in flv file format saving 8 mp3 frames per packet instead of 1
- fixed crasher in flv file format involving mp3 buffer handling
- added FLV1 codec support for swf file format (FlashPlayer6 or above
required) and made it default
- fixed broken mp3 support in swf file format
patch by (Tinic Uro <turo at macromedia dot com>)
cleanup by me

Originally committed as revision 2756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 23:56:37 +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
de7ff1f774 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper 
Originally committed as revision 2751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 03:56:05 +00:00
Michael Niedermayer
364a179749 quantizer noise shaping optimization 
Originally committed as revision 2750 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 02:12:37 +00:00
Michael Niedermayer
deb7a6cdaf simplify 
Originally committed as revision 2743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-02 14:59:43 +00:00
Michael Niedermayer
77ea0d4bdd quantizer noise shaping 
Originally committed as revision 2742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-02 03:52:58 +00:00
Michael Niedermayer
2c8b796fa9 b frames + cbr fix 
Originally committed as revision 2730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-29 15:50:54 +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
303e50e65b closed gop support & flags2 as all bits in flags are used 
and a few minor things i forgot to commit ...

Originally committed as revision 2718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-22 19:48:28 +00:00
Michael Niedermayer
20f155ed80 avcodec_flush_buffers() fix 
Originally committed as revision 2715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-19 14:41:34 +00:00
Michael Niedermayer
2c492e94fc removing broken framerate conversation hack in mpeg1/2 
Originally committed as revision 2713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-18 21:41:44 +00:00
Michael Niedermayer
507a8e0d70 type fixes, found by Wolfgang Hesseler 
Originally committed as revision 2694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-12 22:39:19 +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
622348f931 interlaced dct decision cleanup 
function moved to dspcontext
  mmx&mmx2 optimized
  change SSE -> SAD as default (better quality)
vbv buffer size command line option in kbyte

Originally committed as revision 2669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-05 22:57:07 +00:00
Michael Niedermayer
0982834b04 non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>) 
Originally committed as revision 2662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-04 17:13:14 +00:00
Michael Niedermayer
5ac59c559b warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend) 
Originally committed as revision 2661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-04 14:43:52 +00:00
Michael Niedermayer
783df5f347 denoise_dct_mmx() 
Originally committed as revision 2657 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-02 22:29:08 +00:00
Michael Niedermayer
fbb898067f more trellis quant optimizations 
Originally committed as revision 2655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-02 19:22:00 +00:00
Michael Niedermayer
34e0a29d36 cleanup 
Originally committed as revision 2651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-02 03:02:34 +00:00
Michael Niedermayer
7485d118f2 optimizing (trellis) quantizer 
Originally committed as revision 2650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-02 02:39:05 +00:00
Michael Niedermayer
ae55b53303 dont show uninitalized motion vectors 
Originally committed as revision 2645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-01 16:56:04 +00:00
Michael Niedermayer
273977d814 rate limit tips and checks 
Originally committed as revision 2643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-01 15:13:44 +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
b846b231b3 100000l 
Originally committed as revision 2637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-30 15:29:38 +00:00
Wolfgang Hesseler
0c9bbaec60 motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>) 
Originally committed as revision 2636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-30 02:12:12 +00:00
Michael Niedermayer
1031fabd14 picture number fixes 
Originally committed as revision 2634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-29 22:25:08 +00:00
Steven M. Schultz
1c004e5622 lrintf patch by ("Steven M. Schultz" <sms at 2BSD dot COM>) 
Originally committed as revision 2630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-22 19:42:28 +00:00
Michael Niedermayer
71c47d6e24 10l (forgot to copy top_field_first flag) 
Originally committed as revision 2629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-22 19:06:01 +00:00
Michael Niedermayer
d60a8f85d7 vbv_delay 
Originally committed as revision 2623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-17 19:53:05 +00:00
Michael Niedermayer
d50635cd24 split intra / inter dequantization 
Originally committed as revision 2607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-14 02:57:00 +00:00
Michael Niedermayer
7ebfc0ea63 error concealment regression test 
Originally committed as revision 2606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-14 01:42:00 +00:00
Michael Niedermayer
d55f7b6521 cleanup 
Originally committed as revision 2605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-13 20:41:33 +00:00
Aurelien Jacobs
0c11692a1d Here are juste two added #ifdef CONFIG_ENCODERS to allow 
libavcodec to compile without CONFIG_ENCODERS defined
patch by (Aurelien Jacobs <aurel at gnuage dot org>)

Originally committed as revision 2604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-13 02:14:18 +00:00
Michael Niedermayer
864119b6ca mb type & qp vissualization 
Originally committed as revision 2603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-13 01:33:52 +00:00
Michael Niedermayer
11dffbe1da stuffing to stay above min_bitrate 
Originally committed as revision 2602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-12 21:30:47 +00:00
Fabrice Bellard
7a0f9d7e7d fixed top_field_first support when encoding 
Originally committed as revision 2600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-12 16:56:38 +00:00
Michael Niedermayer
dd5e90cd55 interlaced dct encoding fix 
Originally committed as revision 2592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-10 17:05:41 +00:00
Fabrice Bellard
db9b1b5eae fixed interlaced encoding 
Originally committed as revision 2590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-10 16:49:20 +00:00
Michael Niedermayer
5ea4b18d9f motion_subsample_log2 
Originally committed as revision 2580 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-09 01:55:54 +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
01e8ff27b4 slice flush / position fix 
Originally committed as revision 2569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-07 02:10:30 +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
c70f1716cf export top_field_first & interlaced_frame 
Originally committed as revision 2564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-05 00:19:46 +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
6beeb962a2 h263 modified quantization fix 
Originally committed as revision 2557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-03 16:07:41 +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
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
Michael Niedermayer
b68ab2609c dont read from b frames if draw_horiz_band==NULL 
Originally committed as revision 2533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-27 13:38:00 +00:00
Michael Niedermayer
9bc8b38660 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>) 
Originally committed as revision 2530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-25 00:35:18 +00:00
Michael Niedermayer
bc1e364666 10l 
Originally committed as revision 2529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-24 21:53:32 +00:00
Michael Niedermayer
ad0d17f1f8 qprd with b frames fix 
Originally committed as revision 2518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-13 23:45:25 +00:00
Michael Niedermayer
dd3e415e06 qprd needs mbd=2 
Originally committed as revision 2517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-13 23:22:06 +00:00
Michael Niedermayer
30758048ef ac prediction with rate distorted qp fix 
Originally committed as revision 2510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-12 13:03:51 +00:00
Michael Niedermayer
1f26c6f338 rate distored optimal lambda->qp support 
Originally committed as revision 2509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-12 12:25:44 +00:00
Michael Niedermayer
ea05d9c9c7 flush fix (untested) 
Originally committed as revision 2473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-03 17:42:50 +00:00
Michael Niedermayer
762357e63a 10l (fixes dct coeff noise reduction) 
Originally committed as revision 2470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-03 13:31:02 +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
821cb11f76 noise reduction of dct coefficients 
Originally committed as revision 2468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-02 23:19:47 +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
Ivan Kalvachev
a579db0c4f XvMC speedup by removing one memcpy and doing MB packing 
Originally committed as revision 2442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-27 23:22:43 +00:00
Michael Niedermayer
6b56c616d9 make convert_matrix() independant of MpegEncContext 
Originally committed as revision 2441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-27 14:37:30 +00:00
Michael Niedermayer
9b4b6e099b segfault fix 
Originally committed as revision 2434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-25 19:30:14 +00:00
Michael Niedermayer
b4c3816cfa optionally merge postscale into quantization table for the float aan dct 
Originally committed as revision 2420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-23 09:11:56 +00:00
Michael Niedermayer
65e4c8c919 floating point AAN DCT 
Originally committed as revision 2415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-22 18:26:38 +00:00
Michael Niedermayer
9d9e31722a 112 bytes smaller MpegEncContext 
Originally committed as revision 2414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-22 15:36:46 +00:00
Michael Niedermayer
45686da26d move blocks away MpegEncContext (7.4 -> 5.8k) 
Originally committed as revision 2413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-22 12:01:21 +00:00
Michael Niedermayer
642ccefbc8 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown) 
Originally committed as revision 2412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-22 11:23:39 +00:00
Michael Niedermayer
7e4995c388 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ... 
Originally committed as revision 2411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-22 10:59:39 +00:00
Michael Niedermayer
b465449eb7 dynamic alloc of picture structs instead of putting them in MpegEncContext 
Originally committed as revision 2410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-21 19:55:31 +00:00
Michael Niedermayer
fa384dcc81 export mpeg2 active display area / pan scan 
fix mpeg2 aspect_ratio for the rare case that active display area != AVCodecContext.width/height
decode sequence display extension & picture display extension

Originally committed as revision 2401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-20 09:52:02 +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
6571e41dcd picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least 
Originally committed as revision 2392 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-16 00:21:54 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO 
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-14 04:15:53 +00:00
Michael Niedermayer
431f2172cd fix decoding if the aspect ratio changes 
Originally committed as revision 2367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-12 21:32:58 +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
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
16c3c1ecb4 rd cbp + single coeff elimination fix 
Originally committed as revision 2333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-02 08:52:37 +00:00
Michael Niedermayer
ca7d05d56f optionally try to encode each MB with MV=<0,0> and choose the one with better RD 
Originally committed as revision 2328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-02 00:24:34 +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
34f60ee61b slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization 
Originally committed as revision 2300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-24 19:45:57 +00:00
Michael Niedermayer
05fbd0a2b0 scenechange_threshold 
Originally committed as revision 2281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-16 11:25:29 +00:00
Michael Niedermayer
541ae14095 AVI stream header FCC / more reliable detection of old xvid files 
Originally committed as revision 2258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-10 23:40:55 +00:00
Michael Niedermayer
2523e73c77 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>) 
Originally committed as revision 2243 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-09 19:46:21 +00:00
Fabrice Bellard
56c4a18464 ctype.h is a common header 
Originally committed as revision 2223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-08 19:58:34 +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
Michael Niedermayer
e4eadb4b44 oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec) 
Originally committed as revision 2165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-25 22:54:53 +00:00
Michael Niedermayer
029911d1c3 mpeg2 encoding 
Originally committed as revision 2164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-25 22:47:32 +00:00
Fabrice Bellard
df15903f27 removed unused variable 
Originally committed as revision 2159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-24 22:13:48 +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
Roman Shaposhnik
36b58e850d * fixing a regression in mpeg encoder (not setting pix_fmt), 
this is hardly the right way to do things, but it'll suffice for now.
   * patch from Gildas Bazin
                gbazin at altern dot org
   * fix for a 10l in configure
   * gcc 2.95.3 and Solaris build in general are not ready
     for -Werror in libavformat/Makefile

Originally committed as revision 2123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-12 18:20:29 +00:00
Michael Niedermayer
6e23091277 check input pix_fmt 
Originally committed as revision 2104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-05 14:08:28 +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
769fc4660c clear bitstream buffers in AVCodec.flush() 
Originally committed as revision 2101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-02 22:01:02 +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
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
Ivan Kalvachev
f23a68dff3 make MPV_frame_start fail on get_buffer failer 
Originally committed as revision 2089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-26 23:31:13 +00:00
Ivan Kalvachev
2e7b4c8442 initial XvMC support 
Originally committed as revision 2085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-26 01:28:49 +00:00
Michael Niedermayer
17d71fb922 last frames & b frames encoding fix 
Originally committed as revision 2075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-23 10:41:07 +00:00
Michael Niedermayer
3bb07d6165 default for slices is display order again 
optional support for field slices & slices in coded order
and single component slices for svq1 (unfinished)

Originally committed as revision 2066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-20 14:48:05 +00:00
Michael Niedermayer
42928ccbc2 svq3 b frame slices fix 
Originally committed as revision 2065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-18 11:47:14 +00:00
Michael Niedermayer
7a06ff148d AVCodec.flush() 
ff_draw_horiz_band() in coded order / cleanup

Originally committed as revision 2064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-17 12:29:07 +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
147e5200ca memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>) 
with minor fix by me

Originally committed as revision 2014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-05 08:31:08 +00:00
Ivan Kalvachev
d55e93e48b Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>) 
Originally committed as revision 2006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-03 23:29:00 +00:00
Michael Niedermayer
8e937a4ad1 2x100l 
Originally committed as revision 1989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-27 12:58:40 +00:00
Ivan Kalvachev
1dff7d56ad DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>) 
Originally committed as revision 1985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-23 22:32:15 +00:00
Michael Niedermayer
c009df3f86 make ff_emulated_edge_mc() independant of MpegEncContext 
Originally committed as revision 1971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-18 22:00:23 +00:00
Michael Niedermayer
b1e6b355f7 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes 
Originally committed as revision 1968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-17 22:48:51 +00:00
Michael Niedermayer
4cdfaf8093 mpeg1 decoding fix 
Originally committed as revision 1917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-29 21:34:25 +00:00
Michael Niedermayer
db6e779506 motion vector vissualization for mpeg1/2 
mpeg1/2 cleanup/bugfix
error resilience bugfix

Originally committed as revision 1911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-27 12:31:03 +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
d8085ea727 cleanup 
Originally committed as revision 1882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-14 23:08:01 +00:00
Michael Niedermayer
8b82a95675 svq3 decoder by anonymous 
Originally committed as revision 1845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-09 22:16:14 +00:00
Michael Niedermayer
e20c40697c release buffer cleanup 
Originally committed as revision 1839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-06 20:43:37 +00:00
Michael Niedermayer
eb14c71360 doxy 
Originally committed as revision 1832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-05 10:00:57 +00:00
Michael Niedermayer
bb463d8102 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers) 
Originally committed as revision 1824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-27 01:11:26 +00:00
Michael Niedermayer
93d4546633 typo in a comment ... 
Originally committed as revision 1821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-25 16:18:35 +00:00
Michael Niedermayer
d90cf87b90 fixing mixed dr1 + internal buffers 
Originally committed as revision 1820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-25 00:29:48 +00:00
Michael Niedermayer
129dfab2c7 10l 
Originally committed as revision 1774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-14 20:02:12 +00:00
Michael Niedermayer
9acbbd16b9 check validity of some flags 
Originally committed as revision 1773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-14 14:06:21 +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
9f2e61b6a3 pict_type & quality fix 
Originally committed as revision 1739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-06 21:03:24 +00:00
Michael Niedermayer
0da71265d8 H264 decoder & demuxer 
Originally committed as revision 1732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-04 14:42:28 +00:00
Michael Niedermayer
2c19981a93 10l 
Originally committed as revision 1725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-02 10:18:29 +00:00
Michael Niedermayer
1f9aea9b91 fixing msmpeg4v2 encoding 
Originally committed as revision 1723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-01 15:38:01 +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
9b8709d135 mpeg1 slice encoding support 
Originally committed as revision 1720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-30 19:26:01 +00:00
Michael Niedermayer
5acaa5e1df simplify slice encoding (variance of packet size is practically identical) 
Originally committed as revision 1719 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-30 16:22:08 +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
67116af9c2 10l 
Originally committed as revision 1699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-22 00:00:53 +00:00
Michael Niedermayer
c5a9ab69c2 qmin/qmax cleanup 
Originally committed as revision 1689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-17 11:02:33 +00:00
Michael Niedermayer
b536d0aad2 field pic decoding cleanup 
Originally committed as revision 1686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-16 20:22:22 +00:00
Zdenek Kabelac
5d4ce4574b * added more options 
Originally committed as revision 1675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-12 19:49:58 +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
Zdenek Kabelac
a77146abfe * 'externaly' visible option list begins avoptions_ prefix 
* fixed FLAG AVOption

Originally committed as revision 1661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-10 11:48:33 +00:00
Michael Niedermayer
7004ffb3d7 merging fourcc with codec_tag 
Originally committed as revision 1645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-08 01:40:52 +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
3c5ce6dc99 cleanup 
Originally committed as revision 1627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-05 20:13:11 +00:00
Michael Niedermayer
640950c700 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why) 
Originally committed as revision 1626 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-05 20:03:15 +00:00
Michael Niedermayer
dfb476cbe0 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...) 
Originally committed as revision 1624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-05 17:48:19 +00:00
Michael Niedermayer
21e59552d6 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications 
Originally committed as revision 1622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-05 16:10:13 +00:00
Michael Niedermayer
3b4f73dc76 typo (fixes wmv1 regression test in c) 
Originally committed as revision 1621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-04 13:05:14 +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
e51d6d27a6 h263(+) clenaup & bugfixes 
Originally committed as revision 1614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-28 13:07:07 +00:00
Michael Niedermayer
ebbcdc9ac0 user specified motion estimation range limit 
h263 me range fixed (was smaller then needed)

Originally committed as revision 1610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-27 22:56: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
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
fe1b62fb3e * still unfinished code for Options 
* demo code - awating more comments

Originally committed as revision 1569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-10 09:40:23 +00:00
Michael Niedermayer
63b15e559a mpeg1 bframe encoding patch by (Raphaël LEGRAND) with some modifications by me 
Originally committed as revision 1551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-08 12:00:57 +00:00
Michael Niedermayer
36df880581 divx503 decoding fix 
Originally committed as revision 1538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-02 23:34:30 +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
b7a22d846b cleanup 
Originally committed as revision 1487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-21 21:30:48 +00:00