Statistics
| Branch: | Revision:

ffmpeg / libavcodec / avcodec.h @ 399cec2f

History | View | Annotate | Download (62.1 KB)

# Date Author Comment
399cec2f 03/03/2004 07:29 PM Michael Niedermayer

count > thread_count for execute()

Originally committed as revision 2842 to svn://svn.ffmpeg.org/ffmpeg/trunk

43465395 03/03/2004 05:53 PM Michael Niedermayer

av_log() cleanup
null pointer segfaults
dont print redundant spam
dont print prefix if reference==NULL
class -> av_class
dont copy AVClass to every object, its a waste of memory and not a good idea at all

Originally committed as revision 2841 to svn://svn.ffmpeg.org/ffmpeg/trunk

bc874dae 03/03/2004 03:41 PM Michel Bardiaux

av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)

Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk

81c5f887 03/03/2004 01:57 AM Michael Niedermayer

macrofree av_freep()

Originally committed as revision 2839 to svn://svn.ffmpeg.org/ffmpeg/trunk

5e5c247a 03/01/2004 02:55 PM Ivan Kalvachev

initial chroma_format changes,xvmc tweaks and codec_cap

Originally committed as revision 2833 to svn://svn.ffmpeg.org/ffmpeg/trunk

2a24fe4c 02/28/2004 04:41 PM Gael Chardon

int64_t_C patch by (Gael Chardon <gael-announcements+ffmpeg at 4now dot net>)

Originally committed as revision 2825 to svn://svn.ffmpeg.org/ffmpeg/trunk

8d52ec7e 02/26/2004 06:29 PM Michael Niedermayer

AVCodec.supported_framerates

Originally committed as revision 2821 to svn://svn.ffmpeg.org/ffmpeg/trunk

71141d77 02/26/2004 03:15 PM Michael Niedermayer

INT64_MIN fix

Originally committed as revision 2820 to svn://svn.ffmpeg.org/ffmpeg/trunk

8289c6fa 02/25/2004 06:29 PM Wolfgang Hesseler

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

5a815088 02/25/2004 06:17 PM Michael Niedermayer

1l

Originally committed as revision 2815 to svn://svn.ffmpeg.org/ffmpeg/trunk

9740beff 02/25/2004 05:35 PM Michael Niedermayer

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

ac2570a8 02/18/2004 01:49 AM Michael Niedermayer

flac fixes:
fix data types of residual&decoded
fix twos complement bitfields
fix utf8 (no, utf8 is not the same as the simple and compact uvlc used in nut)
add truncated bitstream support, both ogg and flac demuxers in mplayer cvs provide incomplete frames, and furthermore it isnt possible to find frameboundaries in flac without decoding it completly...

9c3d33d6 02/13/2004 05:54 PM Michael Niedermayer

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...

e5966052 02/07/2004 08:20 AM Roman Shaposhnik
  • Initial implementation of the G.726 ADPCM audio codec.

Originally committed as revision 2759 to svn://svn.ffmpeg.org/ffmpeg/trunk

070ed1bc 02/05/2004 05:22 AM Mike Melanson

initial commit for Quicktime Animation (RLE) video decoder; bit depths
32, 24, and 16 are working; 8bpp is partially working; 4, 2, and 1 bpp
are not supported yet

Originally committed as revision 2748 to svn://svn.ffmpeg.org/ffmpeg/trunk

a412a03b 02/05/2004 12:35 AM Michael Niedermayer

remove incorect motion estimation table

Originally committed as revision 2747 to svn://svn.ffmpeg.org/ffmpeg/trunk

7d8379f2 02/03/2004 04:27 AM Mike Melanson

added support for EA ADPCM and SMJPEG IMA ADPCM

Originally committed as revision 2744 to svn://svn.ffmpeg.org/ffmpeg/trunk

77ea0d4b 02/02/2004 03:52 AM Michael Niedermayer

quantizer noise shaping

Originally committed as revision 2742 to svn://svn.ffmpeg.org/ffmpeg/trunk

303e50e6 01/22/2004 07:48 PM Michael Niedermayer

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

a273bbfb 01/12/2004 10:14 PM Roberto Togni

MSZH and ZLIB decoder support
Experimental ZLIB encoder (not working yet)

Originally committed as revision 2693 to svn://svn.ffmpeg.org/ffmpeg/trunk

a1e257b2 01/08/2004 09:08 PM Michael Niedermayer

optimize compute_antialias() and add a floating point based alternative (2x faster)

Originally committed as revision 2679 to svn://svn.ffmpeg.org/ffmpeg/trunk

622348f9 01/05/2004 10:57 PM Michael Niedermayer

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

baaf3f46 01/04/2004 12:23 AM Michael Niedermayer

SVCD scan offset stuff

Originally committed as revision 2660 to svn://svn.ffmpeg.org/ffmpeg/trunk

fafa0b75 01/02/2004 04:45 AM Mike Melanson

first pass at Sierra VMD A/V decoders; video looks great, audio is not
yet complete

Originally committed as revision 2652 to svn://svn.ffmpeg.org/ffmpeg/trunk

bb198e19 12/30/2003 04:07 PM Michael Niedermayer

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)...

0c9bbaec 12/30/2003 02:12 AM Wolfgang Hesseler

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

b84f2a35 12/16/2003 11:17 AM Fabrice Bellard

pts and dts support in parser API

Originally committed as revision 2619 to svn://svn.ffmpeg.org/ffmpeg/trunk

7ebfc0ea 12/14/2003 01:42 AM Michael Niedermayer

error concealment regression test

Originally committed as revision 2606 to svn://svn.ffmpeg.org/ffmpeg/trunk

864119b6 12/13/2003 01:33 AM Michael Niedermayer

mb type & qp vissualization

Originally committed as revision 2603 to svn://svn.ffmpeg.org/ffmpeg/trunk

8d7ec294 12/09/2003 01:49 AM Wolfgang Hesseler

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

ba58dabc 12/07/2003 01:33 AM Michael Niedermayer

h263 slice structured mode
slice cleanup

Originally committed as revision 2568 to svn://svn.ffmpeg.org/ffmpeg/trunk

9a4117d5 12/03/2003 04:22 AM Mike Melanson

initial support for Duck TrueMotion v1 (think of it as On2 VP1); only
16-bit mode supported thus far

Originally committed as revision 2555 to svn://svn.ffmpeg.org/ffmpeg/trunk

332f9ac4 12/01/2003 03:23 PM Michael Niedermayer

h263 loop filter
fixed h263 modified quantization
CODEC_FLAG_OBMC

Originally committed as revision 2549 to svn://svn.ffmpeg.org/ffmpeg/trunk

68b94c35 11/30/2003 02:35 PM Michael Niedermayer

rv20 decoder

Originally committed as revision 2543 to svn://svn.ffmpeg.org/ffmpeg/trunk

dba019da 11/29/2003 08:37 AM Michael Niedermayer

h263 alternative inter vlc support

Originally committed as revision 2541 to svn://svn.ffmpeg.org/ffmpeg/trunk

e1c2a5a0 11/26/2003 08:57 PM Roberto Togni

- Add reget_buffer() function to AVCodecContext
- Add default reget_buffer implementation in libavcodec/utils.c
- Remove AVCodecContext.cr_available, no longer needed
- Remove CODEC_CAP_CR, no longer used
- Add img_copy() prototype to avcodec.h (function from imgconvert.c)...

42cad81a 11/14/2003 05:42 AM Mike Melanson

yep, FLI support

Originally committed as revision 2519 to svn://svn.ffmpeg.org/ffmpeg/trunk

4b813d5c 11/13/2003 10:20 PM Zdenek Kabelac
  • sys/types.h for size_t

Originally committed as revision 2516 to svn://svn.ffmpeg.org/ffmpeg/trunk

1f26c6f3 11/12/2003 12:25 PM Michael Niedermayer

rate distored optimal lambda->qp support

Originally committed as revision 2509 to svn://svn.ffmpeg.org/ffmpeg/trunk

c512b303 11/12/2003 01:19 AM Ivan Kalvachev

mpegvideo is back

Originally committed as revision 2507 to svn://svn.ffmpeg.org/ffmpeg/trunk

8424cf50 11/10/2003 03:29 PM Fabrice Bellard

new audio/video parser API

Originally committed as revision 2492 to svn://svn.ffmpeg.org/ffmpeg/trunk

11e29a41 11/10/2003 03:14 AM Mike Melanson

added Apple Graphics (SMC) decoder

Originally committed as revision 2488 to svn://svn.ffmpeg.org/ffmpeg/trunk

1dc1ed99 11/07/2003 10:39 PM Roberto Togni

8BPS decoder

Originally committed as revision 2486 to svn://svn.ffmpeg.org/ffmpeg/trunk

074c4ca7 11/07/2003 09:20 PM Roberto Togni

Add cr codec capability and buffer hints

Originally committed as revision 2484 to svn://svn.ffmpeg.org/ffmpeg/trunk

9b879566 11/03/2003 01:26 PM Michel Bardiaux

av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)

Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk

821cb11f 11/02/2003 11:19 PM Michael Niedermayer

noise reduction of dct coefficients

Originally committed as revision 2468 to svn://svn.ffmpeg.org/ffmpeg/trunk

432d84c3 11/02/2003 10:56 PM Michael Niedermayer

10l ...

Originally committed as revision 2467 to svn://svn.ffmpeg.org/ffmpeg/trunk

2e99641b 11/02/2003 09:53 PM Roberto Togni

Fix some palette related defines, bump build number

Originally committed as revision 2464 to svn://svn.ffmpeg.org/ffmpeg/trunk

2a2bbcb0 10/30/2003 05:40 AM Mike Melanson

revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)

Originally committed as revision 2451 to svn://svn.ffmpeg.org/ffmpeg/trunk

985180a1 10/29/2003 02:08 PM Fabrice Bellard

added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)

Originally committed as revision 2445 to svn://svn.ffmpeg.org/ffmpeg/trunk

65e4c8c9 10/22/2003 06:26 PM Michael Niedermayer

floating point AAN DCT

Originally committed as revision 2415 to svn://svn.ffmpeg.org/ffmpeg/trunk

5ff85f1d 10/20/2003 08:23 PM Michael Niedermayer

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

9dad924e 10/20/2003 10:33 AM Michael Niedermayer

bottom_field_first -> top_field_first

Originally committed as revision 2402 to svn://svn.ffmpeg.org/ffmpeg/trunk

fa384dcc 10/20/2003 09:52 AM Michael Niedermayer

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

dc7cb06a 10/19/2003 09:05 PM Dan Christiansen

gcc->C99 and warning fixes patch by (Dan Christiansen <danchr at daimi dot au dot dk>)

Originally committed as revision 2399 to svn://svn.ffmpeg.org/ffmpeg/trunk

2744ca9a 10/18/2003 03:19 AM Roman Shaposhnik
  • providing MPEG codecs with a generic fields in AVFrame to use.
    • fixing YUV4MPEG format.
    • fixing a bug in DV codec where coded_frame was not set.

Originally committed as revision 2396 to svn://svn.ffmpeg.org/ffmpeg/trunk

fc384777 10/15/2003 03:20 AM Mike Melanson

activate the XA and ADX ADPCM codecs

Originally committed as revision 2385 to svn://svn.ffmpeg.org/ffmpeg/trunk

ac0c6638 10/13/2003 11:13 AM Michael Niedermayer

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

5e83dec4 10/11/2003 09:49 PM Alex Beregszaszi

Sunplus JPEG codec (SP5X) support

Originally committed as revision 2362 to svn://svn.ffmpeg.org/ffmpeg/trunk

f44ee2c3 10/11/2003 05:44 PM Alex Beregszaszi

theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)

Originally committed as revision 2359 to svn://svn.ffmpeg.org/ffmpeg/trunk

95831f48 10/11/2003 08:21 AM Michael Niedermayer

recommit of
slightly cleaner width / height comment

Originally committed as revision 2353 to svn://svn.ffmpeg.org/ffmpeg/trunk

75917b88 10/11/2003 08:18 AM Drew Hess

recommit of
promote avpicture_alloc to public interface patch by (Drew Hess <dhess at ilm dot com>)

Originally committed as revision 2351 to svn://svn.ffmpeg.org/ffmpeg/trunk

158c7f05 10/07/2003 11:32 AM Michael Niedermayer

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

29d48296 10/04/2003 09:53 AM Michael Niedermayer

Patch for AAC encoding with libfaac by (Gildas Bazin <gbazin at altern dot org>)

Originally committed as revision 2342 to svn://svn.ffmpeg.org/ffmpeg/trunk

4120a53a 10/03/2003 05:43 AM Mike Melanson

implemented Id Quake II CIN support

Originally committed as revision 2339 to svn://svn.ffmpeg.org/ffmpeg/trunk

6955a882 10/02/2003 05:20 AM Mike Melanson

first pass at a VQA video decoder

Originally committed as revision 2332 to svn://svn.ffmpeg.org/ffmpeg/trunk

ca7d05d5 10/02/2003 12:24 AM Michael Niedermayer

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

8d8c0294 10/01/2003 03:41 PM Michael Niedermayer

ac prediction cleanup
rate distorted optimal ac prediction for mpeg4

Originally committed as revision 2325 to svn://svn.ffmpeg.org/ffmpeg/trunk

2fdf638b 10/01/2003 04:39 AM Mike Melanson

New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
Video-1, Apple RPZA, Cinepak, Westwood IMA ADPCM

Originally committed as revision 2324 to svn://svn.ffmpeg.org/ffmpeg/trunk

f2f6134b 09/30/2003 10:18 PM Michael Niedermayer

rate distortion optimal cbp support (h263/mpeg4 non intra only)

Originally committed as revision 2323 to svn://svn.ffmpeg.org/ffmpeg/trunk

7458ccbb 09/29/2003 05:54 PM Roman Shaposhnik
  • DV handling was streamlined for both muxing/demuxing and
    decoding. All muxing/demuxing functionality is now available
    in libavformat/dv.[ch].
    • dv1394.c and avidec.c were hooked up with general DV demuxer.
    • DVAUDIO is dead! Long live pcm_s16le!...
da64ecc3 09/29/2003 03:44 PM Drew Hess

avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)

Originally committed as revision 2318 to svn://svn.ffmpeg.org/ffmpeg/trunk

d663a1fd 09/28/2003 08:34 PM Michael Niedermayer

AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)

Originally committed as revision 2311 to svn://svn.ffmpeg.org/ffmpeg/trunk

05fbd0a2 09/16/2003 11:25 AM Michael Niedermayer

scenechange_threshold

Originally committed as revision 2281 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f371e3e 09/13/2003 02:31 AM Mike Melanson

final word on RGBA byte order

Originally committed as revision 2268 to svn://svn.ffmpeg.org/ffmpeg/trunk

ba118447 09/12/2003 03:48 AM Mike Melanson

deploy palette control API

Originally committed as revision 2266 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b7d86f1 09/11/2003 10:51 PM Fabrice Bellard

simplified version handling

Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk

541ae140 09/10/2003 11:40 PM Michael Niedermayer

AVI stream header FCC / more reliable detection of old xvid files

Originally committed as revision 2258 to svn://svn.ffmpeg.org/ffmpeg/trunk

8fc6c2b5 09/10/2003 11:28 AM Michael Niedermayer

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

dcedf586 09/08/2003 10:03 PM Fabrice Bellard

changed my mind about CODEC_ID_MPEGVIDEO - CODEC_ID_MP3LAME is absolete

Originally committed as revision 2231 to svn://svn.ffmpeg.org/ffmpeg/trunk

9937e686 09/08/2003 04:10 AM Mike Melanson

New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM

Originally committed as revision 2217 to svn://svn.ffmpeg.org/ffmpeg/trunk

8026c3b5 09/05/2003 02:41 PM Alex Beregszaszi

bump version numbers to 0.4.8

Originally committed as revision 2210 to svn://svn.ffmpeg.org/ffmpeg/trunk

e91df376 09/02/2003 08:34 AM Michael Niedermayer

CODEC_ID_MPEGVIDEO

Originally committed as revision 2198 to svn://svn.ffmpeg.org/ffmpeg/trunk

3ef8be2b 09/02/2003 04:32 AM Mike Melanson

initial commit for Id RoQ and Interplay MVE multimedia subsystems

Originally committed as revision 2195 to svn://svn.ffmpeg.org/ffmpeg/trunk

9b56edf5 09/01/2003 08:10 AM Michael Niedermayer

ASV2 decoder

Originally committed as revision 2186 to svn://svn.ffmpeg.org/ffmpeg/trunk

922bc38d 08/26/2003 07:42 AM Michael Niedermayer

mpeg2 regression test
add mpeg2video_decoder, thats more consistant with the encoders, note, both mpeg1video and mpeg2video decoder will happily decode both mpeg1 and 2

Originally committed as revision 2166 to svn://svn.ffmpeg.org/ffmpeg/trunk

e4eadb4b 08/25/2003 10:54 PM Michael Niedermayer

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

029911d1 08/25/2003 10:47 PM Michael Niedermayer

mpeg2 encoding

Originally committed as revision 2164 to svn://svn.ffmpeg.org/ffmpeg/trunk

d6eb3c50 08/22/2003 10:18 PM Michael Niedermayer

custom quant matrix encoding support

Originally committed as revision 2135 to svn://svn.ffmpeg.org/ffmpeg/trunk

c3bf0288 08/22/2003 02:59 PM Michael Niedermayer

PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
note: completly untested, no demuxer yet

Originally committed as revision 2134 to svn://svn.ffmpeg.org/ffmpeg/trunk

bd5a6020 08/18/2003 09:20 AM Michael Niedermayer

use codec_tag for encoding too

Originally committed as revision 2125 to svn://svn.ffmpeg.org/ffmpeg/trunk

36b58e85 08/12/2003 06:20 PM Roman Shaposhnik
  • 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...
7d1c3fc1 07/29/2003 02:09 AM Michael Niedermayer

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

3aff069b 07/27/2003 08:20 PM Alex Beregszaszi

CLJR decoding support

Originally committed as revision 2090 to svn://svn.ffmpeg.org/ffmpeg/trunk

fb364ada 07/26/2003 01:52 AM Ivan Kalvachev

initial XvMC support

Originally committed as revision 2087 to svn://svn.ffmpeg.org/ffmpeg/trunk

be3564ed 07/24/2003 12:18 PM Michael Niedermayer

ATI VCR1 decoder

Originally committed as revision 2076 to svn://svn.ffmpeg.org/ffmpeg/trunk

3bb07d61 07/20/2003 02:48 PM Michael Niedermayer

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

7a06ff14 07/17/2003 12:29 PM Michael Niedermayer

AVCodec.flush()
ff_draw_horiz_band() in coded order / cleanup

Originally committed as revision 2064 to svn://svn.ffmpeg.org/ffmpeg/trunk

d4f5d74a 07/09/2003 11:10 PM Garrick Meeker

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

bd7d1ea7 07/07/2003 11:19 AM Alex Beregszaszi

Optimized simple idct for arm by Frederic 'dilb' Boulay <>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change

Originally committed as revision 2017 to svn://svn.ffmpeg.org/ffmpeg/trunk