Statistics
| Branch: | Revision:

ffmpeg @ 5a011d8b

# Date Author Comment
5a011d8b 02/18/2010 09:12 PM Stefano Sabatini

Merge two if conditions, allow to decrese the level of indentation of
the block.

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

13887093 02/18/2010 08:47 PM Stefano Sabatini

FFmpeg is a collective effort so allowing a single name in a banner is
not nice/fair towards the community of developers.

Also this looks like the best way for resolving the debate about which
is the one person name to be put in the banner.

See the thread:...

b80218aa 02/18/2010 07:14 PM Måns Rullgård

Suppress icc warnings about unknown attributes

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

3cc3581d 02/18/2010 06:23 PM Stefan Gehrer

fix intra prediction modes with inter-MB neighbors,
the old sample clips are in violation of the 2006 spec

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

bf7c1719 02/18/2010 04:27 PM Kostya Shishkov

Make RTMP client send bytes read report

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

19769ece 02/18/2010 04:24 PM Måns Rullgård

H264: use alias-safe macros

This eliminates all aliasing violation warnings in h264 code.
No measurable speed difference with gcc-4.4.3 on i7.

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

f4a7434f 02/18/2010 01:44 PM Måns Rullgård

Add alias-safe aligned AV_[RW]N macros

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

7a6053ef 02/18/2010 01:40 PM Måns Rullgård

Use alias-safe types in AV_COPY/SWAP/ZERO macros

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

0c76e635 02/18/2010 01:40 PM Måns Rullgård

Use alias-safe types in AV_[RW] macros

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

d10458c9 02/18/2010 01:40 PM Måns Rullgård

Add alias-safe union typedefs

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

024bf79f 02/18/2010 12:37 PM Michael Niedermayer

Simplify deblock_left/top condition for deblocking_filter=2

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

90a5849e 02/18/2010 12:13 PM Michael Niedermayer

Speedup decode_cabac_field_decoding_flag() by 9 cpu cycles.

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

077a8d61 02/18/2010 12:19 AM Michael Niedermayer

fix issue 1747

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

5e46be96 02/17/2010 11:58 PM Måns Rullgård

Move NEG_[US]SR32 macros to mathops.h

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

dc9e57a8 02/17/2010 11:26 PM Thilo Borgmann

Fix sizeof()-statement to use the actual pointer type.

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

cd092849 02/17/2010 10:53 PM Thilo Borgmann

Fix wrong buffer allocation for MCC in ALS.

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

43cfefaf 02/17/2010 09:37 PM Måns Rullgård

Use stripped executable in regression tests

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

4f837398 02/17/2010 09:37 PM Måns Rullgård

configure: allow setting strip tool with --strip

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

fd10543e 02/17/2010 09:20 PM Alex Converse

get_bits: Fix spelling and grammar in GET_VLC() comment.

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

1e2245c2 02/17/2010 09:04 PM Måns Rullgård

10l: remove stray '(' I don't know where it came from

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

40d11227 02/17/2010 08:36 PM Måns Rullgård

Use LOCAL_ALIGNED macro for local arrays

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

e6a0c354 02/17/2010 08:36 PM Måns Rullgård

PPC and x86 support aligning variables on stack

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

d96cd429 02/17/2010 08:36 PM Måns Rullgård

Add LOCAL_ALIGNED() macro for declaring aligned local arrays

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

2480c390 02/17/2010 08:36 PM Måns Rullgård

Simplify some declarations of aligned arrays

If DECLARE_ALIGNED_16 works on uint64_t it will work smaller types too.

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

dfd017bf 02/17/2010 07:24 PM Martin Storsjö

Add functions to send RTSP commands with content attached to them. This will
be used eventually in the RTSP muxer (see thread "[PATCH] RTSP muxer, round
3" on mailinglist).

Patch by Martin Storsjö <$firstname $firstname st>.

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

69a28f3e 02/17/2010 02:25 AM Michael Niedermayer

Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
there as well.

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

69cc3183 02/17/2010 02:14 AM Michael Niedermayer

Move check for and call of predict_field_decoding_flag() from the mb code to
the row code. This function would only be needed on a MB basis for MBAFF+FMO

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

59f733d1 02/16/2010 11:43 PM Michael Niedermayer

2x faster ff_h264_init_cabac_states(), 4k cpu cycles less.
Sadly this is just per slice so the speedup with normal files should be negligible.

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

fc78b0cb 02/16/2010 11:00 PM Ronald S. Bultje

Remove first_rtcp_ntp_time. This is used to prevent overflow of the timestamp,
but doesn't actually do that. What's worse, it creates timestamp adjustments
that are different per stream within a session, leading to a/v sync issues.

See discussion in thread "[FFmpeg-devel] rtp streaming x264+audio issues (and...

9c8fa20d 02/16/2010 10:50 PM Martin Storsjö

When using RTP-over-UDP, send dummy packets during stream setup, similar to
what e.g. RealPlayer does. This allows proper port forwarding setup in NAT-
based environments.

Patch by Martin Storsjö <$firstname at $firstname dot st>.

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

fe74099a 02/16/2010 10:38 PM Stefano Sabatini

Rename the "enc" variable, which refers to the AVCodecContext of a
decoder, to "avctx".

See the thread:
Subject: [FFmpeg-devel] [PATCH] enc is not a good name for a decoder context
Date: Mon, 28 Dec 2009 22:56:25 +0100

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

f47a7cb7 02/16/2010 08:17 PM Stefano Sabatini

Move read_line() and write_line() definition from pixdesc.h to
pixdesc.c, which are now not anymore marked as static inline.

Fix the inclusion of the private header intreadwrite.h in the public
header pixdesc.h.

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

a636b58c 02/16/2010 07:26 PM Ronald S. Bultje

Fix two problems (no idea how this ever worked):
- the return value of url_open_dyn_*buf() is 0 on success, so using
if (!(res = url_open_dyn_*buf())) return res; is not going to work
- url_open_dyn_packet_buf actually writes the max_packet_size before...

4abd8514 02/16/2010 06:25 PM Ronald S. Bultje

Revert r21851.

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

298d2fd3 02/16/2010 06:19 PM Ronald S. Bultje

Don't return 0 if buffer setup failed. That signals the RTSP demuxer that
the packet was filled in, leading to virtually random behaviour in the
decoder later on. Instead, return a negative value.

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

ed7694d8 02/16/2010 04:32 PM Anton Khirnov

Set lavf identification string globally in av_write_header(), rather
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.

Patch by Anton Khirnov <wyskas gmail com>.

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

11431599 02/16/2010 02:48 PM Thilo Borgmann

Limit the Rice parameter used for progressive decoding in ALS.

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

85207e38 02/16/2010 02:33 PM James Darnley

Add lsp.o as a dependency for wmavoice. This fixes a compilation error when
you disable lots of stuff (in particular other voice codecs) but leave
wmavoice enabled.

Patch by James Darnley <$firstname dot $lastname at gmail dot com>.

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

899605f1 02/16/2010 09:55 AM Peter Ross

Support IFF ANNO (annotation) chunk type

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

cbba8fec 02/16/2010 09:33 AM Peter Ross

Support <8-bit ILBM uncompressed bitmaps

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

37a9719a 02/16/2010 02:51 AM Michael Niedermayer

2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()

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

5806e8cd 02/16/2010 12:09 AM Michael Niedermayer

Drop a few redundant slice_num checks.

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

05307427 02/15/2010 11:04 PM Michael Niedermayer

Drop compute_mb_neighbors() and move fill_decode_neighbors() up to take its
role.
Should be faster as this is a strict code removial.

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

c1bb66ac 02/15/2010 10:07 PM Michael Niedermayer

Split setting neighboring MBs from fill_decode_caches()
no speed change.

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

83a6c1a6 02/15/2010 09:19 PM Anton Khirnov

Strings in extended content header are UTF16,
so terminating NULLs are 2 bytes long, not 1.

Patch by Anton Khirnov, wyskas gmail

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

4a3104a9 02/15/2010 09:14 PM Anton Khirnov

workaround for broken files created by previous versions of asfenc.

Patch by Anton Khirnov, wyskas gmail

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

cf55f59d 02/15/2010 07:22 PM Michael Niedermayer

Simplify decode_cabac_mb_intra4x4_pred_mode().
same speed

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

f4060611 02/15/2010 07:20 PM Michael Niedermayer

Merge decode_cabac_mb_type_b() into calling code.
This avoids a conditional branch and is about 3 cpu cyclues faster.

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

6713b6b1 02/15/2010 05:37 PM Maxim Poliakovski

Remove outdated comment.

Patch by Maxim, max_pole gmx de

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

35122bd9 02/15/2010 04:43 PM Stefan Gehrer

add heuristic to discern the old sample clips from streams encoded
with rm52j encoder, a marker_bit has been added in the I-Frame syntax

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

026b9d3c 02/15/2010 04:37 PM Stefan Gehrer

avoid using DECLARE_ALIGNED on stack variable as suggested by Reimar

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

89584458 02/15/2010 04:29 PM Alex Converse

AAC: Mark che_configure() as av_cold.

It is also only called when the output configuration is not locked.

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

ff98c17c 02/15/2010 04:19 PM Alex Converse

AAC: Mark functions that are only called when the output configuration is not locked as av_cold.

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

005caa34 02/15/2010 11:26 AM Peter Ross

IFF bitmap n-bit color support

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

24006f59 02/15/2010 09:11 AM Michael Niedermayer

10l ;; gcc 2.95 compilation fix by mike

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

cbfcde9f 02/15/2010 01:24 AM Michael Niedermayer

10l use pack16to32(), should fix big endian h264 failures.

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

64dd1b0a 02/15/2010 01:04 AM Michael Niedermayer

Merge the single line function decode_cabac_mb_transform_size()
into the calling code.
8 cpu cycles faster

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

8b38d107 02/14/2010 11:10 PM Michael Niedermayer

indent

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

f4b8b825 02/14/2010 11:06 PM Michael Niedermayer

Merge decode_cabac_mb_dqp() with surronding code.
~20 cpu cycles faster

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

94cb5994 02/14/2010 10:59 PM Michael Niedermayer

Drop if(0) code.

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

4130f739 02/14/2010 07:00 PM Reimar Döffinger

Reindent

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

3adcfbbe 02/14/2010 06:59 PM Reimar Döffinger

Optimize h261_probe function, since it is far slower than all others.
About 5 times faster.

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

a59b9ee3 02/14/2010 04:51 PM Michael Niedermayer

Set sub_mb_type in direct_cache instead of just the direct flag.
Simpler, cleaner and faster.

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

2dc380ca 02/14/2010 02:41 PM Michael Niedermayer

Store sub_mb_type in direct_cache/direct_table.
This is equal complexity but could be more usefull.

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

d3037bbe 02/14/2010 10:17 AM Thilo Borgmann

Add myself as maintainer of bgmc.[ch].

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

3d2c3ef4 02/14/2010 02:08 AM Michael Niedermayer

Remove slice_table checks from decode_cabac_mb_cbp_luma() and set left/top_cbp so
these checks arent needed.

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

056c5021 02/14/2010 02:04 AM Michael Niedermayer

Revert r21814
Log:
h264: Fix pointer warnings by removing redundant [0]

Fixes:
h264.h:1222:38: warning: initialization from incompatible pointer type
h264.h:1299:38: warning: initialization from incompatible pointer type
h264.h:1314:42: warning: initialization from incompatible pointer type...
6e7c397b 02/14/2010 01:14 AM Michael Niedermayer

Cosmetics, vertical align.

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

e9167646 02/13/2010 10:53 PM Michael Niedermayer

Direct temporal skiped MBs dont need fill_decode_caches() at all so dont call it
for them.

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

78998bf2 02/13/2010 09:09 PM Alexander Strange

h264: Remove unused variables.

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

677dab59 02/13/2010 09:08 PM Alexander Strange

h264: Fix pointer warnings by removing redundant [0]

Fixes:
h264.h:1222:38: warning: initialization from incompatible pointer type
h264.h:1299:38: warning: initialization from incompatible pointer type
h264.h:1314:42: warning: initialization from incompatible pointer type...

cd12c377 02/13/2010 08:57 PM Alexander Strange

Fix integer overflow warnings in h264.h

Fixes:
h264.h: In function 'fill_filter_caches':
h264.h:1216:73: warning: integer overflow in expression
h264.h:1307:81: warning: integer overflow in expression

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

bb770c5b 02/13/2010 08:13 PM Michael Niedermayer

Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)

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

2e4362af 02/13/2010 08:13 PM Michael Niedermayer

Skiped MBs dont need the cbp stuff so skip initing that.

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

65760304 02/13/2010 07:59 PM Thilo Borgmann

Reindent a line.

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

e2b28acf 02/13/2010 07:39 PM Michael Niedermayer

Also skip direct/mvd_cache init for skiped blocks.
Odd thing is i thought ive tryed this already and it failed previously.

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

09946fb1 02/13/2010 07:24 PM Thilo Borgmann

Add myself as contributor.

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

071cfdce 02/13/2010 07:23 PM Thilo Borgmann

Add myself as ALS maintainer.

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

cb9285a2 02/13/2010 07:00 PM Michael Niedermayer

Move more code under if(!IS_DIRECT(mb_type)).

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

161e8cf4 02/13/2010 06:59 PM David Conrad

Move CODEC_FLAG_GRAY check to outer loop

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

7c2e31d1 02/13/2010 06:59 PM David Conrad

Move branch based on custom mode outside the loop

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

eb691ef2 02/13/2010 06:55 PM David Conrad

Directly check whether a fragment is coded for 4MV mode instead of iterating
through the entire coded fragment list.

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

15675ce6 02/13/2010 06:55 PM David Conrad

Eliminate fragment -> macroblock mapping array

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

ea676144 02/13/2010 06:55 PM David Conrad

Eliminate macroblock -> fragment mapping array

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

19cd517d 02/13/2010 06:55 PM David Conrad

Eliminate superblock <-> macroblock mapping array

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

25608328 02/13/2010 06:24 PM Thilo Borgmann

Support arithmetic decoding in ALS.

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

f2b37637 02/13/2010 06:23 PM Michael Niedermayer

Skip some more code that isnt needed for direct MBs.

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

4bf2b9e8 02/13/2010 05:57 PM Ben Littler

add netspeak gsm and truespeech wav format tags to riff.c

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

7df8af63 02/13/2010 05:42 PM Francesco Lavra

Fix reading beyond buffer end on RA144Context.lpc_tables.

Patch by Francesco Lavra (francescolavra at interfree dot it)

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

f2a4f12c 02/13/2010 04:56 PM Måns Rullgård

Do not call lseek() with invalid whence value

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

5ca43c25 02/13/2010 03:57 PM Michael Niedermayer

Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler.

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

da452aca 02/13/2010 03:30 PM Michael Niedermayer

Dont calculate any surrounding MVs for temporal MBs

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

0d88ff4c 02/13/2010 03:12 PM Stefano Sabatini

Add my name to CREDITS.

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

5134ad53 02/13/2010 01:28 PM Michael Niedermayer

Simplify if()

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

752cc0dc 02/13/2010 01:14 PM Michael Niedermayer

Init sub_mb_type cleanly.

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

923bcb40 02/13/2010 01:04 PM Michael Niedermayer

100l Forgoten hunk.unbreak compile before someone notices.

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

af0d6581 02/13/2010 01:02 PM Michael Niedermayer

Restructure spatial direct MV generation so that the zero predictior shortcut
is closer at the top.
50-130 cpu cycles faster depending on which kind of direct MBs are meassured.

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

edb4df43 02/13/2010 03:46 AM Michael Niedermayer

Split spatial and temporal direct MV generation.
A little faster and needed for future optimizations.
This sadly leads to some code duplication (which i hope i can factor out
again after the optimizations on the direcr mv code are done)

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

3beb81e7 02/13/2010 03:43 AM Ramiro Polla

Fix compilation with --enable-libgsm on Gentoo and OpenSUSE.

Patch by Ramiro

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

812bfd7b 02/13/2010 02:47 AM Michael Niedermayer

Special case for spatial direct MV predictor being 0.
a little less than 200 cpu cycles faster with the cathedral sample.

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