Statistics
| Branch: | Revision:

ffmpeg / doc / ffmpeg-doc.texi @ 43836928

History | View | Annotate | Download (27.4 KB)

# Date Author Comment
b3555bf0 09/13/2010 01:25 PM Reinhard Tartler

fix x11grab example in e.g. the manpage so that they actually work

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

e1f4dd6d 08/11/2010 02:49 PM Stefano Sabatini

Extend and clarify documentation for -ac ffmpeg option.

Fix roundup issue #2061.

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

1de4cfe6 07/31/2010 03:45 PM Stefano Sabatini

Add protocols.texi.

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

4419c8bf 07/27/2010 01:10 PM Stefano Sabatini

Add the indevs.texi and outdevs.texi files.

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

0461367c 07/11/2010 11:56 AM Stefan de Konink

Fix crop filter syntax shown for the -crop* options in the ffmpeg man
page.

Patch by Stefan de Konink /$name/@/konink/de.

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

74dc99f2 07/04/2010 08:59 PM Stefano Sabatini

Update help message for the -pad* options, as they have been removed,
and update the manual page accordingly.

Based on a patch by John Calcote $(echo "<>" | tr "b-za" "a-z").

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

dbb113e8 07/04/2010 10:49 AM Stefano Sabatini

Add notices for the -crop* options in the ffmpeg manual, stating that
the options are deprecated and that -vf crop should be used instead.

Based on a patch by John Calcote $(echo "<>" | tr "04731" "oatei").

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

006e8108 06/30/2010 10:35 PM Mike Scheutzow

Add new option "streamid" to set the value of an outfile streamid.

Patch by Mike Scheutzow, scheutzow alcatel-lucent com

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

a2e47338 06/22/2010 10:54 PM Stefano Sabatini

Extend documentation for the ffmpeg -timestamp option.

'(' and ')' are used instead of '{' and '}' in the date specification
as the latter confound the texinfo interpreter.

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

3275ac6a 06/21/2010 10:09 PM Stefano Sabatini

Make the ffmpeg and ffplay man pages show the list of lavfi filters,
sinks and sources, and document the -vf option.

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

a66d8cd9 06/08/2010 10:32 PM Stefano Sabatini

Rename the ff* tools @chapters "Invocation" to "Synopsis", and place
them at the beginning of the file, for consistency with the final
ordering of the corresponding man pages.

Also create a separate @chapter for the "Options" section, as it is
done for the man pages, rather than merge it in the same section of...

aeadb328 06/05/2010 04:21 PM Stefano Sabatini

Replace "Fabrice Bellard" with "The FFmpeg developers" as the authors
of the ff* tools man pages.

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

76561924 06/03/2010 08:11 PM Stefano Sabatini

Move section EXAMPLES towards the end of the ffmpeg-doc.texi file.

This is consistent with the the rendered ordering of the ffmpeg man
page.

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

b26247ed 06/03/2010 07:16 PM Stefano Sabatini

Make consistent the various SEE ALSO sections in the FFmpeg man pages.

Also replace "the HTML documentation of @file{ffmpeg}" with "the FFmpeg
HTML documentation", which is more generic.

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

cadbccb6 06/03/2010 07:07 PM Stefano Sabatini

Put @ignore-d man page specific trailer at the end of the file.

This makes the ordering of the sections in the file more consistent
with that of the final man output.

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

54b11f17 06/01/2010 02:08 PM Stefano Sabatini

Rename @chapter "Quick Start" to "Examples", for consistency with the
corresponding man page section.

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

9f41ed5a 06/01/2010 02:00 PM Stefano Sabatini

Fix texi2pod.pl rendering of the Tips section by putting each @item
command on its own line, and create a corresponding "TIPS" man page
section.

Note that such section is not displayed, as currently only sections
with pre-defined names are rendered.

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

12f8341a 06/01/2010 01:09 PM Stefano Sabatini

Merge @chapter Introduction and @chapter Description into a single
section, and make the whole rendered in the man output.

Simplify layout, and make it more consistent with that of the other
man pages. Also I cannot see a good reason for keeping split the two...

2328e5a2 04/20/2010 05:37 PM Robert Krüger

Allow setting the environment variable FFMPEG_DATADIR to locate preset files.

Patch by Robert Krüger <krueger signal7 de>.

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

c7512f6b 03/31/2010 02:15 PM Jai Menon

Fix a few typos/grammar nits from r22739.

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

49553ec8 03/31/2010 12:41 AM Michael Niedermayer

Better documentation of -vsync

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

35a3bd84 03/18/2010 12:24 AM Carl Eugen Hoyos

It is difficult nowadays to compile without swscale support.

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

fc5607f8 02/22/2010 10:21 PM Reimar Döffinger

Make -benchmark also print the maximum memory usage if possible.

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

8b9da8b5 02/21/2010 10:56 AM Stefano Sabatini

Put all the options shared amongst the ff* tools under a dedicated
section "Generic options".

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

385e1658 01/19/2010 10:13 PM John Van Sickle

Adds -aq documentation to the ffmpeg docs.

Patch by John Van Sickle rot13(<>).

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

5f6cb6eb 12/21/2009 09:32 PM Stefano Sabatini

Factorize common options documentation.

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

870e0150 12/21/2009 02:20 AM Ramiro Polla

Add -?, -help, and --help as alternative options to get help.

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

0fc2c0f6 12/16/2009 12:08 PM Matthieu Crapet

Add -vlang option to set ISO 639 video stream language code.
This is similar to existing -alang & -slang options.

Patch by Matthieu Crapet m${surname} ^ gmail com.

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

62d75662 12/12/2009 04:18 PM Stefano Sabatini

Implement a -filters option, listing all the available libavfilter
filters.
Currently filters are not registered, so the option will show none.

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

35c504b6 12/06/2009 05:02 PM Ramiro Polla

Update documentation for r20435 (which added the -fpre option).

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

0584b718 11/20/2009 10:23 AM Daniel Verkamp

Document -formats split

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

f0ef7bee 10/01/2009 01:48 PM Diego Biurrun

Document -sn option.

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

13d41a19 09/26/2009 05:21 PM Stefano Sabatini

Document the -loglevel option in the ffmpeg man page.

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

72cdcc0b 09/13/2009 04:46 PM Diego Biurrun Replace @node commands with @anchor to refer to specific points in the text.
This fixes the warnings
  • `Developers Guide' is up for `Coding Rules', but has no menu entry for this node
  • `Invocation' is up for `FFmpeg formula evaluator', but has no menu entry for this node...
edb501c4 07/01/2009 08:11 PM Stefano Sabatini

Add an explanation and complete the metadata usage example.

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

5227bd63 06/28/2009 08:25 PM Stefano Sabatini

Fix braino.

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

39a4f146 06/27/2009 01:26 PM Stefano Sabatini

Update ffmpeg documentation regarding metadata setting. -title,
-author, -copyright, -track, -album, and -year options have been
dropped in favor of -metadata.

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

2b12317a 04/09/2009 09:52 PM Martin Storsjö

Fix documentation for the "-ps" option
Patch by Martin Storsjö (martin AT martin DOT st)

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

41913a35 04/01/2009 08:55 AM Gwenole Beauchesne

Add 16cif video frame size abbreviation. i.e. -s alias for 1408x1152.

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

c73d3996 03/14/2009 10:18 AM Stefano Sabatini

Add an example showing how to create a video from many images.

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

fdf11906 03/03/2009 02:09 PM Diego Biurrun

Remove deprecated vhook subsystem.

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

66d82290 02/25/2009 08:18 PM Robert Swain

http://bytesex.org/xawtv/ permanently redirects to
http://linux.bytesex.org/xawtv/ so update the URL

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

f67f485b 02/23/2009 01:47 AM Daniel Verkamp

Document 'ffmpeg -formats', patch by Daniel Verkamp, daniel drv nu.

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

bd591ead 01/26/2009 10:23 PM Stefano Sabatini

Update preset files documentation to match with r16795.

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

17bdc290 01/13/2009 09:20 PM Víctor Paesa

Document the ld, st, while statements.

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

593b3219 01/13/2009 09:07 PM Víctor Paesa

Document the same functions, in the same order, that eval.c has.

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

44fe7113 12/26/2008 01:40 PM Stefano Sabatini

Fix documentation for -passlogfile, the argument is not a file name
but a prefix used to create the complete pass log file name.

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

c2902c9c 12/01/2008 08:27 AM Stefano Sabatini

Improve documentation for the -pass and -passlog options. Add mention
to how the log file is used and specify the default log file name.

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

c27c66c3 10/13/2008 03:09 PM Benoit Fouet

Add a space between frequencies and their units.

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

66e9aa74 10/05/2008 10:41 PM Stefano Sabatini

Make less verbose a sentence in the preset system documentation.

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

4a60e574 10/05/2008 09:45 AM Stefano Sabatini

Document the preset files system.

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

1a27fb00 10/03/2008 07:14 PM Diego Biurrun

FFmpeg is not made for bats: Fix 22050Hz vs. 22050kHz typo.

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

910f02a0 10/02/2008 04:28 PM Diego Biurrun

spelling cosmetics

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

07696497 08/29/2008 05:44 PM Stefano Sabatini

Add to the ffmpeg manual an example showing how to add streams to the
output.

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

850a8d42 08/13/2008 07:49 PM Erwan Ducroquet

Add examples in documentation showing how to avoid to decode audio and
output video in pass 1 for 2-pass encoding.
Patch by Erwan Ducroquet erwan dot ducroquet at gmail dot com

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

8d36d36e 08/12/2008 10:07 AM Stefano Sabatini

Add to the ffmpeg docs an usage example showing how to extract images
from a video.

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

bb89b0bc 08/04/2008 07:02 AM Stefano Sabatini

Improve docs for the ffmpeg -map option.

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

9c170372 07/27/2008 07:38 PM tripp

Fix and clarify invalid examples for framerate override in the documentation.
patch by tripp, eliared yahoo com

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

e3576e25 07/25/2008 09:04 PM Jason Garrett-Glaser

Improve documentation about -bt option

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

3a9b190c 07/22/2008 07:20 AM tripp

Enhance qblur and qcomp documentation.
Patch by tripp eliared yahoo com

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

5ad2b4c6 07/21/2008 09:06 PM tripp

Add complete listing of bitstream filters and 2 examples to the documentation.
patch by tripp, eliared yahoo com

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

bbc35f51 07/21/2008 05:25 AM tripp

Clarify -minrate/-maxrate description in the documentation.
patch by tripp, eliared yahoo com

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

831ec935 06/06/2008 07:51 AM Diego Biurrun

Run documentation through ispell, plus some minor fixes.

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

a19caa0f 04/08/2008 04:39 PM Stefano Sabatini

Mark option arguments as variables using @var{}.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

53d1bdba 02/25/2008 04:01 PM Stefano Sabatini

Clarify the documentation for 'ffmpeg -v'.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

1156c6b0 09/07/2007 01:49 PM Ramiro Polla

Rename the format name audio_device (used in both oss and audio_beos) to oss and audio_beos.
-f oss and -f audio_beos should be used instead.

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

d0e1cd3d 08/28/2007 06:22 AM Diego Biurrun

Split FFmpeg documentation into general documentation and the documentation
of the ffmpeg command line program.

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

250c5317 08/20/2007 06:50 AM Godwin Stewart

update -t option documentation
Patch by Godwin Stewart

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

e1669c5e 08/13/2007 10:15 PM Diego Biurrun

Attempt to better explain how to split patches into individual
self-contained pieces.

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

fa78d895 08/06/2007 09:19 PM Diego Biurrun

spelling/grammar

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

f754bfb9 08/06/2007 12:05 AM Michael Niedermayer

get rid of nonsense "tolerance" and mention VBV

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

1502409e 07/16/2007 09:00 AM Diego Biurrun

Add note about vertical alignment to patch guidelines.

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

78a3c678 07/16/2007 08:54 AM Diego Biurrun

spelling/grammar/wording

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

0f69ca7f 07/13/2007 02:33 PM Diego Biurrun

Clarify license requirements for contributions.

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

c0de00da 07/06/2007 11:47 AM Stefano Sabatini

me option implemented as an AVOption
patch by Stefano Sabatini: [stefano sabatini-lala poste it]
original thread:
[FFmpeg-devel] [PATCH] ffmpeg.c -me option implemented as an AVOption
date: 07/05/2007 03:12 PM

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

c74a8fe6 07/03/2007 05:59 PM Ramiro Polla

Add note about dlfcn-win32 for MinGW vhooks

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

d3b7406c 07/02/2007 07:06 AM Alexis Ballier

QT RLE encoder
patch by Alexis Ballier: [alexis ballier gmail com]
original thread: [FFmpeg-devel] [Patch] QT RLE encoder, bis
date: 06/24/2007 03:56 PM

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

7cbf432d 06/27/2007 10:37 AM Vitor Sessak

Mention unneeded casts and parentheses
patch by Vitor: [vitor1001 gmail com]

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

03e3e765 06/25/2007 12:09 PM Vitor Sessak

RoQ video encoder
patch by Vitor: \vitor1001 gmail com/
original thread: [FFmpeg-devel] RoQ video encoder (take 3)
date: 06/08/2007 10:34 PM

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

43399718 06/21/2007 08:21 PM Víctor Paesa

Add a few missing Advanced Options.

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

755bfeab 06/12/2007 09:29 AM Diego Biurrun

misc spelling fixes

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

1aa80145 06/11/2007 11:37 PM Michael Niedermayer

dont attach huge samplesto mails

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

7b900f2d 06/07/2007 04:49 PM Diego Biurrun

'-acodec mp3' --> '-acodec libmp3lame'

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

1cc60c47 06/06/2007 08:51 AM Diego Biurrun

Consistent naming and lib prefixes for x264, xvid and mp3lame within the code.

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

c3b95b1d 05/30/2007 02:20 PM Stefano Sabatini

Add support for listing the supported pixel formats using the option
-pix_fmt list
patch by Stefano Sabatini stefano sabatini minus lala chez poste it
original thread: [FFmpeg-devel] [PATCH] List supported pixel formats
date: 05/25/2007 05:46 PM

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

197b07f3 05/27/2007 01:33 PM Diego Biurrun

--enable-amr-* --> -- enable-libamr-*

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

35926489 05/23/2007 06:35 PM Ivo van Poorten

-sws_flags command line option to set swscaler flags

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

13dec857 05/09/2007 11:07 PM Vitor Sessak

RoQ muxer, patch by Vitor, vitor1001 gmail com
reference thread:
Subject: [FFmpeg-devel] [PATCH] RoQ muxer
Date: Wed, 09 May 2007 19:44:21 +0200

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

12b6d7c0 05/08/2007 11:01 AM Ivo van Poorten

add Renderware TXD format

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

d58bbf81 05/08/2007 11:00 AM Ivo van Poorten

add V.Flash PTX image format

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

b09432ad 05/07/2007 11:33 PM Diego Biurrun

RoQ audio encoder

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

d9a3c855 05/06/2007 12:23 PM Michael Niedermayer

better wording for the alphabetical lists

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

6e4bc6ee 05/06/2007 10:48 AM Diego Biurrun

Add a note about maintaining alphabetical order to patch submission checklist.

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

e300ab4e 05/04/2007 07:39 PM Diego Biurrun

Add a note about tabs + trailing whitespace to the patch submission checklist.

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

b0fee7c5 05/04/2007 07:37 PM Diego Biurrun

Group benchmark items in the patch submission checklist together.

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

bca098f5 04/26/2007 09:47 AM Diego Biurrun

Policy addition: New files should have proper license headers.

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

73508bc6 04/25/2007 07:12 PM Diego Biurrun

Remove hackish support for the non-free fixed-point AMR-NB reference code.

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

b60d1379 04/25/2007 01:55 PM Stefano Sabatini

add a vstats_file command line option
patch by Stefano Sabatini stefano sabatini-lala poste it

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

4bd0c2b1 04/25/2007 01:48 PM Benoit Fouet

Revert my two previous deliveries (back to r8806) to aply the good patch for vstats

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

f801d8aa 04/25/2007 09:32 AM Stefano Sabatini

add a vstats_file command line option
patch by Stefano Sabatini stefano sabatini-lala poste it

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