Statistics
| Branch: | Revision:

ffmpeg @ 77544e5b

# Date Author Comment
77544e5b 03/23/2009 11:01 PM Stefano Sabatini

Use PIX_FMT_NE() for defining the PIX_FMT_RGB32 variants macros.

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

1cee4eaf 03/23/2009 10:57 PM Stefano Sabatini

Make the PIX_FMT_NE() macro more generic.

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

3c32bac8 03/23/2009 10:09 PM Gwenole Beauchesne

Add MPEG-2 bitstream decoding through VA API.

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

fbf1b885 03/23/2009 04:43 PM avcoder

Move declaration of 'pict' closer to where it is used and initialize it.
Patch by avcoder: gmail(ffmpeg)

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

6d69a653 03/23/2009 10:58 AM Benoit Fouet

Move av_class to AVResampleContext instead of ReSampleContext.
Fixes issue 852.

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

04964ee8 03/23/2009 05:13 AM Alex Converse

AAC: Ignore cc_domain for independent (time domain) coupling.

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

620bba16 03/22/2009 11:42 PM Stefano Sabatini

Add pcxenc.o to the $OBJS list, it was erroneously removed from it in
r18164.
Fix compilation.

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

e8b03952 03/22/2009 11:22 PM Justin Ruggles

flacdec: cosmetics: white space

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

fbc4d9c9 03/22/2009 11:19 PM Justin Ruggles

flacdec: cosmetics: separate the pure frame header parsing code from
other frame header decoding code

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

9e12268c 03/22/2009 11:15 PM Diego Biurrun

Rename 'tests' target to 'testprogs'. It is too easily confused with the
'test' target and a directory named tests exists.

Originally committed as revision 29039 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

661ce289 03/22/2009 11:13 PM Diego Biurrun

Rename 'tests' target to 'testprogs'. It is too easily confused with the
'test' target and a directory named tests exists.

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

f1c5438f 03/22/2009 11:09 PM Diego Biurrun

Remove unnecessary CLEANFILES declaration. Test programs do not require it.

Originally committed as revision 29038 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

fd8e28b7 03/22/2009 10:50 PM Diego Biurrun

Split AVCodec declarations for PAM/PBM/PGM/PGMYUV/PPM decoders and encoders
so that they can be enabled and disabled individually.

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

6e08ca9c 03/22/2009 10:50 PM Stefano Sabatini

Make the pixel formats which were defined as macros:
PIX_FMT_ARGB
PIX_FMT_RGBA
PIX_FMT_ABGR
PIX_FMT_BGRA

defined as enum PixelFormat values, and viceversa make:
PIX_FMT_RGB32
PIX_FMT_RGB32_1
PIX_FMT_BGR32
PIX_FMT_BGR32_1

defined as macros, also resort accordingly the enum PixelFormat...

e7e6b068 03/22/2009 10:38 PM Justin Ruggles

flacdec: allow sample rate to change mid-stream, but log a warning
message when it does

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

6708cfc4 03/22/2009 10:33 PM Diego Biurrun

Add rule for building API example programs.

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

326e9eaa 03/22/2009 10:13 PM Stefano Sabatini

Factorize: use the X_NE() macro in avcodec_get_pix_fmt().

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

14489074 03/22/2009 10:12 PM Justin Ruggles

flacdec: cosmetics: indentation

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

8199ea3b 03/22/2009 10:10 PM Stefano Sabatini

Implement X_NE() macro.

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

e2a38af9 03/22/2009 10:10 PM Justin Ruggles

flacdec: change frame bps validation to return an error value if bps
changes since this is not currently supported by the decoder.

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

f91eaf5d 03/22/2009 09:53 PM Justin Ruggles

flacdec: cosmetics: add some braces to if/else statements

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

b6fa746e 03/22/2009 09:31 PM Justin Ruggles

flacdec: skip frame when allocated data size is too small

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

492cc392 03/22/2009 09:13 PM Justin Ruggles

10l: don't check against current layout until after validating ch_mode.
should have been in last commit.

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

7660dc6f 03/22/2009 09:07 PM Justin Ruggles

flacdec: give a more accurate error message when validating channel
layout. differentiates between invalid values and unsupported values.

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

d2863e72 03/22/2009 09:01 PM Stefano Sabatini

Export to pixdesc.h the av_pix_fmt_descriptors array.

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

02b26d2d 03/22/2009 08:19 PM Justin Ruggles

flacdec: move data size check to flac_decode_frame()

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

4285c292 03/22/2009 07:12 PM Justin Ruggles

flacdec: comments and white space.
move skipping of frame header to decode_frame()

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

d1d9945f 03/22/2009 06:59 PM Justin Ruggles

cosmetics: vertical alignment

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

5c3e0340 03/22/2009 06:59 PM Justin Ruggles

flacdec: remove unneeded local variable

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

3b4d96fa 03/22/2009 06:56 PM Justin Ruggles

flacdec: cosmetics: rename 3 variables

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

7e00bd84 03/22/2009 06:52 PM Justin Ruggles

flacdec: use a local variable for GetBitContext in decode_frame()

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

bd51c013 03/22/2009 04:10 PM Aurelien Jacobs

handle id3v2 'genre' tag formated as '%d'

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

2121b160 03/22/2009 01:05 PM Ronald S. Bultje

Remove alpha channel from default colorspace tables, since it is unused. See
"qtpalette.h" thread on mailinglist.

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

3c3e0680 03/22/2009 01:00 PM Diego Biurrun

Use $< automatic variable to simplify some commands.

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

e6b09f43 03/22/2009 12:47 PM Ronald S. Bultje

Add a @todo with a comment from Kostya so we don't forget to optimize that at
some point in the future.

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

c21fbefb 03/22/2009 07:40 AM Kostya Shishkov

Add AURA 1 and 2 codec IDs and register their FOURCCs

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

5c5776e1 03/22/2009 03:52 AM Baptiste Coudurier

allocate tracks instead of using MAX_STREAMS

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

44dff005 03/22/2009 02:53 AM Baptiste Coudurier

init ext sample rate to 0 if not present

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

08a5b4e9 03/22/2009 02:47 AM Baptiste Coudurier

since code now use get_bits_long, allocate padding buffer

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

5f01c125 03/22/2009 02:04 AM Baptiste Coudurier

avoid creating a new stream not referenced in pmt since it cannot be associated to a program, fix issue 835

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

b38d7298 03/22/2009 01:32 AM Gwenole Beauchesne

Add common VA API data structures and helpers.

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

ff8084cf 03/21/2009 11:59 PM Michael Niedermayer

Enable unscaled packed422 -> planar 420 converters by default as the
imgconvert inherited quality issues should be fixed.

Originally committed as revision 29031 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

3d99e069 03/21/2009 11:52 PM Michael Niedermayer

10l (C code was buggy and untested)

Originally committed as revision 29030 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

870a4adb 03/21/2009 11:45 PM Michael Niedermayer

Average chroma of 2 lines in packed 422 -> planar 420.

Originally committed as revision 29029 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

bb691a6d 03/21/2009 11:44 PM Gwenole Beauchesne

Add support for HW accelerated VC-1 decoding through the new
AVHWAccel infrastructure.

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

a0dd3c00 03/21/2009 11:29 PM Baptiste Coudurier

reset codec width/height for h264 forcing decoder to parse extradata

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

f82674e5 03/21/2009 11:08 PM Stefano Sabatini

Change the RGB5X5/BGR5X5 pixel format defines so that we have little
endian and big endian variants instead of native-endian ones.

This patch breaks API/ABI backward-compatibility.

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

31a79497 03/21/2009 10:50 PM Stefano Sabatini

Use PIX_FMT_NE() macro.

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

a1a05abe 03/21/2009 10:48 PM Stefano Sabatini

Implement PIX_FMT_NE() macro.

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

d89f692f 03/21/2009 10:43 PM Stefano Sabatini

Extend the behavior of avcodec_get_pix_fmt(), if it cannot find a
pixel format for the provided name, make it look for the native endian
variant of the name.

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

a61ec8e7 03/21/2009 10:24 PM Stefano Sabatini

Globally prefer enum PixelFormat over int when it makes sense.

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

cc9aced3 03/21/2009 09:02 PM Ronald S. Bultje

Remove slash-skipping code because the function called right after that
statement (get_word_sep()) already does that all by itself. See summary in
"[PATCH] rtsp.c small cleanups" thread on mailinglist.

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

78f731de 03/21/2009 09:00 PM Ronald S. Bultje

Reindent something where a if () --> { <-- is on a newline rather than on the
same line as the if. See summary in "[PATCH] rtsp.c small cleanups" thread on
mailinglist.

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

7d09a993 03/21/2009 08:59 PM Ronald S. Bultje

Free metadata if already allocated; fixes a memleak if the header occurs twice
in a stream (e.g. malicious input, broken file, etc.). See summary in "[PATCH]
rtsp.c small cleanups" thread on mailinglist.

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

6a8c8b36 03/21/2009 08:58 PM Ronald S. Bultje

Fix silly bug in hex_to_data() where it compares a string pointer for whether
it is '\0' rather than its content (char *p; if (p '\0') instead of if
(*p '\0')). See summary in "[PATCH] rtsp.c small cleanups" thread on
mailinglist.

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

64917dd3 03/21/2009 08:56 PM Ronald S. Bultje

Remove useless comment about something that is deprecated. See summary in
"[PATCH] rtsp.c small cleanups" thread on mailinglist.

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

36aa7bc2 03/21/2009 08:55 PM Ronald S. Bultje

Use skip_spaces() in the "redir" demuxer instead of "while (isspace(&p)) p++".
See summary in "[PATCH] rtsp.c small cleanups" thread on mailinglist.

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

1ef36a70 03/21/2009 08:54 PM Ronald S. Bultje

Merge functional code from get_word() and get_word_sep() into a single
function, since they both do approximately the same thing. At the same time,
remove redir_isspace() altogether since code elsewhere (including
get_word_sep()) uses strchr() for the same purpose. See summary in "[PATCH]...

7e726132 03/21/2009 08:46 PM Ronald S. Bultje

Allow (and parse) incoming server messages (notices) interleaved with TCP
data packets or in addition to UDP data packets, over the RTSP/TCP connection.
See discussion in [PATCH] rtsp.c: read TCP server notifications/messages"
thread on mailinglist.

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

9c610b76 03/21/2009 08:44 PM Ronald S. Bultje

Add a @todo item to use ByteIOContext instead of URLContext at some point in
the future, requested by Luca in "[PATCH] rtsp.c: read TCP server
notifications/messages" thread.

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

8b9794e5 03/21/2009 08:34 PM Ronald S. Bultje

Remove index writing in RM muxer, since it is broken (multiple streams per
single index chunk) and is always empty anyway. See "[PATCH] rmenc.c: remove
index writing" thread.

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

83c0ba3d 03/21/2009 07:19 PM Ronald S. Bultje

Don't allow to sync on packets of zero-size length, since these are never
valid. See "[PATCH] rmdec.c: prevent zero-length packets" thread.

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

e75e603c 03/21/2009 07:18 PM Ronald S. Bultje

Move "- 12" statement up a bit. See "[PATCH] rmdec.c: prevent zero-length
packets" thread.

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

ee6624ef 03/21/2009 05:28 PM Diego Biurrun

Remove deprecated and now unused Mersenne Twister PRNG.

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

6a03a34b 03/21/2009 05:01 PM Kostya Shishkov

Register myself as Smacker maintainer

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

9f5da4d1 03/21/2009 04:16 PM Diego Biurrun

When warning about forbidden pseudo random number generation functions,
suggest the correct replacement functions.

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

573e0118 03/21/2009 04:14 PM Diego Biurrun

Fix reference to av_random_init where av_lfg_init was meant.

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

0e4cb6cb 03/21/2009 04:14 PM Diego Biurrun

Fix reference to av_random where av_lfg_get was meant.

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

e1dc16ae 03/21/2009 03:52 PM Daniel Verkamp

Make Smacker audio decoder output audio in original bit depth

Patch by Daniel Verkamp
($firstname) at (three-letter file extension for drivers in Win 3.1) dot (nu)

Thread: [PATCH] Smacker: Output audio in original bit depth

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

2bbd8571 03/21/2009 01:51 PM Diego Biurrun

Remove deprecated functions and structures on next version bump.

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

986b6f8f 03/21/2009 12:16 PM Cédric Schieli

Fix build failure on x86_32 Mac OS X with PIC enabled

Originally committed as revision 29022 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

64159a58 03/21/2009 10:32 AM Baptiste Coudurier

check if feed max file size is too small

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

1f611549 03/21/2009 10:29 AM Baptiste Coudurier

cosmetics, reindent and remove empty line

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

861ec13a 03/21/2009 10:28 AM Baptiste Coudurier

new Truncate option which will make feeder truncate feed file

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

899a8fa1 03/21/2009 10:25 AM Reimar Döffinger

Fix avpicture_get_size for non-paletted formats with a helper palette
to not include the size of that palette.
Also clarify its documentation.

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

6f348086 03/21/2009 10:20 AM Reimar Döffinger

Fix planarCopy to ignore the GRAY8 "pseudo"-palette, fixes libavtest regression test.

Originally committed as revision 29021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

31e2d5d3 03/21/2009 10:03 AM Baptiste Coudurier

update ffserver regression ref

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

85fe4ae0 03/21/2009 09:58 AM Baptiste Coudurier

do not call av_find_stream_info if stream is ffm, should fix stalling

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

0bdd8b85 03/21/2009 09:56 AM Baptiste Coudurier

send busy reply if max connections number is exceeded

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

1a4ab332 03/21/2009 08:22 AM David Conrad

Reindent

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

6e6abd02 03/21/2009 08:22 AM David Conrad

Fix Speex header parsing in ogg demuxer

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

1fa9726c 03/21/2009 08:03 AM David Conrad

Document ogg_codec's header function

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

be2a6e2f 03/21/2009 07:36 AM Baptiste Coudurier

fix compilation when DEBUG_SEEK is defined

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

92a0f338 03/21/2009 07:35 AM Baptiste Coudurier

fix valid seeking range

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

7e24aa0c 03/21/2009 06:52 AM Baptiste Coudurier

adjust write index if not set

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

a9c6fc7b 03/21/2009 05:03 AM Baptiste Coudurier

update seek regression ref due to 18063

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

d7687763 03/21/2009 03:14 AM Justin Ruggles

Take over sole maintainership for all FLAC-related stuff

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

59f60d05 03/21/2009 02:06 AM Justin Ruggles

Fix the ogg regression test, which was broken by r18092. This is an
expected change because the ogg muxer with FLAC encoder uses the maximum
frame size estimate since it cannot rewrite the real maximum frame size
at end of encoding.

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

0e442b84 03/21/2009 01:55 AM Justin Ruggles

add myself as maintainer for new FLAC files

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

0fb2182d 03/21/2009 01:54 AM Justin Ruggles

add a function to calculate a more accurate estimate for maximum FLAC
frame size and use the function in the FLAC decoder and FLAC encoder

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

f5187c7f 03/21/2009 01:27 AM Justin Ruggles

flacdec: account for frame and subframe header overhead when calculating
estimate for maximum frame size

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

f1216221 03/21/2009 01:20 AM Justin Ruggles

revert accidental unrelated change in last commit

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

d4df4e50 03/21/2009 01:16 AM Justin Ruggles

share sample rate and blocksize tables between the FLAC encoder and FLAC
decoder

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

b4800b8b 03/21/2009 12:50 AM Baptiste Coudurier

protect realloc overflow

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

b9b4fc5e 03/21/2009 12:50 AM Justin Ruggles

flacenc: remove unneeded variable, 'min_encoded_framesize' and use
'min_framesize' instead

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

29b0d168 03/21/2009 12:49 AM Justin Ruggles

seek backwards 4 bytes if 'fLaC' marker is not found

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

d9e7fa80 03/21/2009 12:48 AM Justin Ruggles

flacdec: remove unneeded variable, 'assignment'

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

2a346725 03/21/2009 12:47 AM Justin Ruggles

flacdec: cosmetics: rename 'decorrelation' to 'ch_mode'

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

ad52941f 03/21/2009 12:45 AM Justin Ruggles

flacenc: remove unneeded context variable, 'ch_code'

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

3159780b 03/21/2009 12:44 AM Justin Ruggles

share channel mode constants between the FLAC decoder and FLAC encoder

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