Statistics
| Branch: | Revision:

ffmpeg / libavcodec @ 64c968da

# Date Author Comment
64c968da 12/21/2005 05:50 PM Diego Biurrun

Add some comments to #ifdef #else #endif blocks and fix wrong ones.

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

a2f3431f 12/21/2005 03:51 PM Michael Niedermayer

also autodetect xvid idct if bitexact is used

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

762b5cd5 12/20/2005 11:07 PM D Richard Felker III

10l to michael for breaking gcc 2.95 compile :)

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

daba69b2 12/19/2005 06:26 PM Michael Niedermayer

10l

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

8ed9f9ab 12/19/2005 01:41 PM Michael Niedermayer

use correct qp & lambda for ME on the second pass

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

2ceff404 12/19/2005 03:08 AM Michael Niedermayer

forgot

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

71160c55 12/18/2005 07:59 PM Michael Niedermayer

fix q=0 bug

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

9944fb97 12/18/2005 01:29 PM Jindřich Makovička

new qscale type to distinguish H264

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

5639729b 12/18/2005 01:17 PM Michael Niedermayer

unfinished jpeg-ls codec (feel free to finish it ...)

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

a42bed52 12/18/2005 11:41 AM Michael Niedermayer

typo

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

6baac1af 12/18/2005 02:23 AM Michael Niedermayer

fix custom matrix permutation if xvid idct is autoselected and you have bad luck

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

115329f1 12/17/2005 06:14 PM Diego Biurrun

COSMETICS: Remove all trailing whitespace.

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

63d33cf4 12/17/2005 11:31 AM Michael Niedermayer

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

725e3877 12/17/2005 11:29 AM Michael Niedermayer

wrong sizes, part of [PATCH] from DivX, Part 9: bitstream crashes from (Steve Lhomme | slhomme divxcorp com)

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

e84a0475 12/14/2005 08:02 AM Mike Melanson

correctly deal with the alpha channel in 32-bit QT RLE (courtesy of John
Koleszar <jkoleszar at on2.com>)

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

0c3ee78f 12/14/2005 12:19 AM Mike Melanson

correctly handle very large Cinepak frames (courtesy of John Koleszar
<>)

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

4733abcb 12/12/2005 01:56 AM Måns Rullgård

use PRIxN, %zd, %td formats where needed

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

7e491fa5 12/12/2005 01:42 AM Måns Rullgård

remove unused variables

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

ab470fa7 12/11/2005 02:16 AM Loren Merritt

recognize some more nal types

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

b7c24ff6 12/11/2005 12:56 AM Benjamin Larsson

This patch adds some support for non-joint stereo streams. It also
removes some fixmes.
Patch by Benjamin Larsson

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

f6d1338c 12/10/2005 10:53 PM Guillaume Poirier

Add the rest of missing Reg_* macros to support both AMD-64 style regs and IA32 regs.
Not used yet, but should be once the SIMD code to accelerate Snow decoding is merged.

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

5a872801 12/10/2005 05:14 PM Luca Barbato

SONAME support for shared libs
patch by Luca Barbato < .. lu_zero .. @@ .. gentoo .. . .. org .. >

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

e0f7e329 12/09/2005 04:08 PM Benjamin Larsson

Cook compatibe decoder, patch by Benjamin Larsson
Add cook demucing, change rm demuxer so that it reorders audio packets
before sending them to the decoder, and send minimum decodeable sized
packets; pass only real codec extradata fo the decoder
Fix 28_8 decoder for the new demuxer strategy...

60d76256 12/07/2005 06:21 PM Michael Niedermayer

psnr calculation with threads>1 fix

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

a4893baf 12/06/2005 05:42 PM Roberto Togni

Support for samples with fft_order = 7
Fail init for unknown fft order, to prevent an array overflow
Output sound high-pitched compared to binary. Sample here
http://a1862.g.akamai.net/7/1862/14448/v1/esa.download.akamai.com/13452/qt/ESA_VenusExpress_110K_Stream.mov...

db795a1c 12/06/2005 04:58 PM Roberto Togni

Remove duplicated fft init

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

4393e639 12/03/2005 02:20 PM Michael Niedermayer

check block_max_depth (fixes crash)

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

91aa4e33 12/03/2005 03:07 AM Michael Niedermayer

make selftest code compile again

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

c7622f9a 12/02/2005 12:12 AM Michael Niedermayer

default_get_buffer() cleanup
fixes probably exploitable heap overflow
heap overflow found by (Simon Kilvington <s D kilvington A eris D qinetiq D com>)

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

9fa62f2a 11/30/2005 01:40 AM Måns Rullgård

BMP image decoder

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

348e52c9 11/21/2005 08:03 PM Guillaume Poirier

Make DV subtitles (en|de)coders be conditonnaly compiled depending on the configure system
Original thread:
Date: Nov 20, 2005 9:25 PM
Subject: [PATCH] make dvdsub encoder depend on config variables

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

31a78b71 11/20/2005 11:09 PM Ivan Kalvachev

Mark all 12 block unused when there are no coded blocks
Fixes 422/444 artifacts

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

689abe56 11/14/2005 10:17 PM Wolfram Gloger

dvbsub encoder, patch by Wolfram Gloger < wmglo AH dent POIS med POIS uni-muenchen POIS de >
Original thread:
Date: 8 Oct 2005 09:35:38 0000
Subject: [Ffmpeg-devel] [PATCH] dvdsub encoder -
2nd version

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

52ceae06 11/13/2005 08:12 PM Alex Beregszaszi

10l, left debugging on

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

2da2ba03 11/13/2005 08:06 PM Matthieu Castet

Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading

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

7146d2c2 11/13/2005 05:59 PM Alex Beregszaszi

Fixing theora again. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.

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

dd36b667 11/13/2005 05:48 PM Alex Beregszaszi

fixed long standing off-by-one bug (fixes playback on ppc)

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

2b18752c 11/13/2005 05:46 PM Alex Beregszaszi

mode_code_vlc_table size mismatch

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

ea15df80 11/12/2005 05:23 AM Loren Merritt

use sse16_sse2() in nsse

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

a0ed075b 11/10/2005 06:05 PM Reimar Döffinger

clear the whole vert_pred buffer for 24 bit decoding.
This is currently not needed since the decoder creates only half of the
pixels, but should reduce confusion for people fiddling with it g

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

4b7e4bed 11/10/2005 01:54 PM Mike Melanson

improvements by Reimar Döffinger; 24-bit decoding is not perfect, only
the left half of the frame is painted, but the area that is painted
looks correct

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

3165e258 11/10/2005 04:40 AM Loren Merritt

fix a crash on seeking to an invalid frame

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

68dce79b 11/09/2005 07:18 PM Måns Rullgård

revert incorrect change

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

af8aa846 11/09/2005 11:29 AM Michael Niedermayer

check MPV_frame_start() return value

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

3712092e 11/09/2005 08:50 AM Steven M. Schultz

s/log2/av_log2/
patch by Steven M. Schultz <sms at 2bsd com>

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

25f8db58 11/07/2005 01:32 AM Fredrik Orderud

Put double-quotes around the install path in the "install-headers" section
of the makefiles for libavcodec, libavformat and libavutil.
Fixes installing into paths with spaces in them, i.e. Windows.
patch by Fredrik Orderud < fredrik . orderud -- at -- idi . ntnu . no >...

7c017693 11/05/2005 07:03 PM Kostya Shishkov

Two tables in truemotion1data.h were slightly different from VpVision
source. This patch fixes decoding of some samples from Phantasmagoria 2
(they use delta tables N1, not N0 as the rest of files).
patch by the author, Kostya Shishkov
< kostya -- dot -- shishkov -- at -- gmail -- dot -- com >...

a75a3ca4 11/05/2005 12:16 AM Michael Niedermayer

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

c555392a 11/05/2005 12:00 AM Roberto Togni

Place qdm2 and truemotion2 in ifdef block so that they can be disabled

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

ed57bb79 11/04/2005 11:24 PM Michael Niedermayer

extradata endianness comment

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

1fd97d8c 11/03/2005 11:26 PM Loren Merritt

tidier cabac_intra4x4_pred_mode

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

d4de20d1 11/02/2005 09:18 AM Guillaume Poirier

Typo fix

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

c7ea4f19 10/28/2005 06:18 PM Måns Rullgård

no mixing of code and declarations

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

5b0e811a 10/28/2005 04:01 PM Matthieu Castet

Make rle_code int everywhere instead of signed char.
Fixes playback of auth_generator-demo.mov, for rle_code == -128 the assignement
rle_code = -rle_code would overflow.
Patch by matthieu castet (castet matthieu (at) free fr)

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

0f72508c 10/28/2005 06:37 AM Loren Merritt

25% faster deblocking, 4-6% overall.

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

cd19c677 10/27/2005 09:03 PM Loren Merritt

fix a crash on dropped frames

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

a6624e21 10/27/2005 06:45 AM Loren Merritt

faster h264_chroma_mc8_mmx, added h264_chroma_mc4_mmx.
2-4% overall speedup.

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

2c5ee47d 10/26/2005 12:51 PM Emiliano Parasassi

avoid the registration of DECODERS if only CONFIG_DECODERS is not defined.
patch by Emiliano Parassassi < millallo AH tiscali -- it >
Original thread:
Date: Mon, 24 Oct 2005 13:03:01 +0200
Subject: [Ffmpeg-devel] [PATCH] avoid registration of decoders if only encoders are choosed...

56edbd81 10/26/2005 03:58 AM Loren Merritt

10l: cqm weren't initialized in svq3.

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

239ea04c 10/25/2005 01:17 AM Loren Merritt

decode custom quant matrices.
based on a patch by anonymous, with optimizations by me.

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

fe9a734c 10/23/2005 06:16 PM Diego Biurrun

Add DTS_INC to the CFLAGS for DTS. This is only set by external configure
programs (such as the MPlayer one) and thus somewhat hackish. We already
do this for things like MLIB_INC and IPP_INC so it should be acceptable.

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

291b3ef4 10/20/2005 08:04 PM Roberto Togni

Increase version because of QDM2 decoder addition

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

065148e7 10/19/2005 10:27 PM Steve L'Homme

init_get_bits() requires size in bits, not bytes
Patch by Steve Lhomme ||| steve | lhomme >at< free | fr |||

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

9918aa24 10/19/2005 06:42 PM Guillaume Poirier

revert useless patch that was supposed to fix DTS support (but the fix belongs to MPlayer, not FFmpeg)

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

3135258e 10/18/2005 08:31 PM Roberto Togni

QDM2 compatible decoder

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

d9b1c197 10/18/2005 08:16 PM Roberto Togni

QDM2 compatible decoder

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

48fa22d7 10/16/2005 01:56 PM Mike Melanson

chroma decoding fix by Kostya

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

e6885654 10/15/2005 04:29 PM Roberto Togni

Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg
Reversing approved by patch author

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

adeba281 10/15/2005 02:33 PM Mike Melanson

TM2 fixes by Kostya

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

aa35d264 10/14/2005 06:17 PM Giacomo Comes

Fix DTS support compilation issue. Patch by Giacomo Comes < comes AH naic POIS edu >
Original thread:
Date: Oct 6, 2005 4:27 PM
Subject: [Ffmpeg-devel] [PATCH] dts support compilation issue

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

670924fd 10/14/2005 04:17 PM Mike Melanson

gcc 2.95 fix, courtesy of Luca Abeni

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

515ae476 10/13/2005 04:35 AM Mike Melanson

support for FLX and DTA extensions in the FLIC format, courtesy of
Steven Johnson (mplayer at sakuraindustries.com)

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

64af6168 10/13/2005 04:31 AM Mike Melanson

Duck TrueMotion 2 video decoder, courtesy of Konstantin Shishkov

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

e134e10f 10/12/2005 10:43 PM Alex Beregszaszi

set_se_golomb can only write 16bits, add a note about this (ok, maybe it's brain dead using it with more than 16bits, but..)

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

d10dc616 10/12/2005 10:40 PM Alex Beregszaszi

sanity check whether dimensions are non-null

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

83254e24 10/12/2005 10:37 PM Alex Beregszaszi

removed unused CONFIG_AUDIO_NONSHORT

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

b926572a 10/09/2005 11:38 PM Loren Merritt

h264 mmx weighted prediction. up to 3% overall speedup.

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

5539733b 10/06/2005 12:13 PM Diego Biurrun

Ignore AMR directories.

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

c99dd233 10/04/2005 11:19 AM j@v2v.cc

Move all definitions of external dependencies into configure instead of
defining it in configure and the Makefiles in a random fashion.
patch by j -- at -- v2v -- dot -- cc

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

5693c083 09/30/2005 02:31 AM Loren Merritt

sse2 16x16 sum squared diff (306=>268 cycles on a K8)
faster 8x8 mmx ssd (77=>70 cycles)

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

d90cbe5f 09/27/2005 05:12 AM Loren Merritt

6% faster decode_cabac_residual

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

ca3b0d27 09/27/2005 04:46 AM diane_cartman@gmx.de

13% faster decode_residual (cavlc).
patch by diane_cartman at gmx dot de.

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

4e159595 09/26/2005 10:05 AM Diego Biurrun

support for building dynamic libraries on Mac OS X
based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org>

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

399d8401 09/24/2005 05:42 PM Michel Bardiaux

Fix some #ifdef to allow building amr_wb alone.
patch by Michel Bardiaux < mbardiaux -- dot -- mediaxim -- dot -- be >

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

288f1e68 09/21/2005 11:18 PM Michel Bardiaux

fix some pointer to intger without cast warnings (patch by Michel Bardiaux)

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

62ab0b78 09/21/2005 11:09 PM Aurelien Jacobs

fix unused variable warnings

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

12e96681 09/21/2005 09:17 PM Michael Niedermayer

replace a few mov + psrlq with pshufw, there are more cases which could benefit from this but they would require us to duplicate some functions ...
the trick is from various places (my own code in libpostproc, a patch on the x264 list, ...)

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

dc9f5260 09/21/2005 08:14 AM Gábor Kovács

Just noticed there is a memory leak in h264.c with the usage of rbsp_buffer.
Here is a patch which frees the rbsp_buffer in decode_end().
patch by (Gábor Kovács | picard / demoscene \ hu)

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

8f196b14 09/20/2005 09:43 PM Michael Niedermayer

changing a few options to AVOptions

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

9061be9f 09/20/2005 06:51 PM Michael Niedermayer

precautionary checks

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

d2752a0d 09/20/2005 12:57 PM Michael Niedermayer

dont print NULL

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

7df65455 09/19/2005 11:26 PM Diego Biurrun

Move lrintf implementation from libavcodec/dsputil.h to libavutil/common.h
where it makes more sense.

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

0f884070 09/19/2005 12:03 PM Michael Niedermayer

set pts for h.263 decoding

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

344b825c 09/18/2005 09:21 PM Diego Biurrun

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

21189011 09/18/2005 02:45 PM Michael Niedermayer

print more time_base fps stuff if av_log level is at debug or above
print more likely correct fps
not sure if this is formated optimally ...

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

357a2843 09/17/2005 08:15 AM Reimar Döffinger

check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
fixes crash with http://stud4.tuwien.ac.at/~e0326863/ats/bbc-sample_small.mpg
and MPlayer's broken packetizer (but will not decode right of course).

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

18ae520b 09/14/2005 09:05 PM Dario Andrade

set more x264 encoding parameters
patch by Dario Andrade <dario at ip tv>

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

fac862c6 09/12/2005 07:16 PM Michael Niedermayer

the people want lower case ...

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

6fd46414 09/12/2005 06:24 PM Michael Niedermayer

dont include opt.h in avcodec.h

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

1471c6c2 09/12/2005 04:30 PM Diego Biurrun

CAREFULL --> CAREFUL typo fix

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