[xiph-commits] r18722 - trunk/ffmpeg2theora
j at svn.xiph.org
j at svn.xiph.org
Sat Nov 24 00:27:29 PST 2012
Author: j
Date: 2012-11-24 00:27:29 -0800 (Sat, 24 Nov 2012)
New Revision: 18722
Added:
trunk/ffmpeg2theora/MOVED_TO_GIT.XIPH.ORG
Removed:
trunk/ffmpeg2theora/AUTHORS
trunk/ffmpeg2theora/COPYING
trunk/ffmpeg2theora/ChangeLog
trunk/ffmpeg2theora/INSTALL
trunk/ffmpeg2theora/Makefile
trunk/ffmpeg2theora/README
trunk/ffmpeg2theora/SConstruct
trunk/ffmpeg2theora/TODO
trunk/ffmpeg2theora/build_ffmpeg.sh
trunk/ffmpeg2theora/ffmpeg2theora.1
trunk/ffmpeg2theora/ffmpeg2theora.pmdoc/
trunk/ffmpeg2theora/ffmpegrev
trunk/ffmpeg2theora/frontend/
trunk/ffmpeg2theora/get_ffmpeg.sh
trunk/ffmpeg2theora/get_libkate.sh
trunk/ffmpeg2theora/kino_export/
trunk/ffmpeg2theora/patches/
trunk/ffmpeg2theora/scons-tools/
trunk/ffmpeg2theora/src/
trunk/ffmpeg2theora/subtitles.txt
trunk/ffmpeg2theora/version.sh
Log:
leave note about migration to git://git.xiph.org/ffmpeg2theora.git
Deleted: trunk/ffmpeg2theora/AUTHORS
===================================================================
--- trunk/ffmpeg2theora/AUTHORS 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/AUTHORS 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1 +0,0 @@
-jan gerber <j at v2v.cc>
Deleted: trunk/ffmpeg2theora/COPYING
===================================================================
--- trunk/ffmpeg2theora/COPYING 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/COPYING 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
Deleted: trunk/ffmpeg2theora/ChangeLog
===================================================================
--- trunk/ffmpeg2theora/ChangeLog 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/ChangeLog 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,201 +0,0 @@
-0.29 2012-06-25
- - use GPL 2 or later, to make use of some decoders only available
- in GPL 2 version of ffmpeg
- - update to current ffmpeg api
- - output version information of libraries used
-
-0.28 2011-07-30
- - select resize method via commandline
- - fix 5.1 channel ordering
- - update to FFmpeg 0.7 branch
-
-0.27 2010-06-18
- - Use Skeleton 4.0 by default (including index),
- can be disabled with --skeleton-3 or --no-skeleton
- - update to FFmpeg 0.6 branch
- - use ogv/oga/ogx depending on input if no output name is specified
- - aspect ratio fix in twopass mode
- - update documentation
-
-0.26 2010-02-05
- - use a/v sync from input container
- this should fix many issues that came up with variable framerate inputs
- - include metadata from source in --info json output
- - update GPL to version 3
- - update fmpeg
- - update libkate
- - OggIndex support, can be enabled with --seek-index
-
-0.25 2009-09-28
- - fix input from codecs where width/height is not encoded width/height
- - fix a/v sync issues with some mov/mp4 files with strange framerates
- - add new option --info outputs json info about source
- - frontend mode outputs one json dict per line now
- - select video stream if input has more than one video(--videostream N)
- - update to ffmpeg trunk and new ffmepg api
- - use new libtheora 1.1
- - use new libtheora encoding api
- add new encoding options --soft-target, --buf-delay
- - two pass encoding, --two-pass
- or in two calls with --first-pass and --second-pass
-
-0.24 2009-03-12
- - fix to make --max_size --no_upscaling work
- - pad image with black instead of green
- - long option for -p is --preset now
- - update to ffmpeg 0.5
-
-0.23 2008-11-30
- - output frontend status to file, for frontends that can not read stdout
- - --no-upscaling new option to only use widht/height, fps, samplerate
- if input is bigger
- - new option: --max_size resize image,
- setting the larger value of width or height to given size
- - fix bugs in crop and deinterlace
- - link os x binary to mmx version of libtheora again
-
-0.22 2008-10-10
- - enable v4l input again (-f video4linux or -f video4linux2)
- - ability to set framerate for image sequences (--inputfps)
- - fix several memory leaks
- - if only width or height are given, the other is set to preserve aspect ratio
- - -start / -end options now work with audio only input
- - new option --novideo to disable input video
- - remove autotools build system, only scons build is supported now.
-
-0.21 2008-05-19
- - switch default extension to .ogv
- - enable Ogg Skeleton by default
- - add kate streams for subtitles (--subtitles, --subtitles-language,
- subtitles-category, and --subtitles-encoding options)
- - start- and endtime now also works if an output framerate is set
- - new presets
-
-0.20 2007-11-31
- - add postprocessing filters, denoise, deblock, dering
- - new preset
- - several bugfixes
-
-0.19 2007-06-29
- - use libswscale api
- - add frontend mode and a simple PythonCard Frontend
- - support for output larger than 2GB on 32bit systems
- - fix short option -k to output Ogg Skeleton
-
-0.18 2007-02-16
- - new option -Z/--saturation
- - document contrast / gamma / brightness / saturation options
- - Mac OS X(Intel) now supports MMX accelerated libtheora
-
-0.17 2006-11-13
- - new option -F/--framerate to set output framerate
- - skeleton support(-k)
- - vhook support(only available if libav* is linked as shared lib)
-
-0.16 2006-02-11
- - support encoding from .ogg input file.
- - don't change samplerate and audio channels unless we use command
- line options -H or -c, or when the input channels are > 2
- (limiting it to a maximum of 2).
- - don't change the image resolution, unless we use the presets or the
- -x or -y options (old default was to encode to preset preview).
- - change the audio quality levels that were multiplied by 0.99, now
- match the quality settings of oggenc, e.g. -a2 == -q2.
- - add --optimize option: use a full search for motion vectors and
- reduce Theora bitrate by about 5%, but it is slower.
- - compile video4linux only under linux.
- - update to help and man page.
-
-0.15 2005-08-31
- - ti.dropframes_p = 0 so we do not loos half of the frames.
- - also increase keyframe interval for better search support.
- - this time the windows build also supports ac3 decoding again.
-
-0.14 2005-08-15
- - add support for v4l input devices
- - update to latest version of ffmpeg-cvs(now uses pkg-config)
- - --audiostream id, new option to select an audio stream if
- input has more than one audio stream
- - fixed ogg muxer
-
-0.13 2005-03-12
- - add new command line options, starttime, endtime, sharpness, keyint
- - fix compile issues with new version of faad
- - better support for stdout on win32,
- to allow ezstream streaming non-theora source types
- - deinterlace only input marked as interlaced by default
- - handle input files with frame sizes that are not a multiple of 16
- - document --channels to resample audio to i.e. 1 channel
-
-0.12 2004-11-18
- - add more command line options, for bitrate modes, metadata
- - update kino plugin
-
-0.11 2004-09-04
- - changed default, then called without parameters to -p preview mode
- - changed PREVIEW(PAL) settings to 384x288 to make pixel aspect ratio 1:1
- - performance improvement if compiled with theora-mmx
- [http://svn.xiph.org/branches/theora-mmx]
- - new option: --aspect to define frame aspect ratio: i.e. 4:3 or 16:9
-
-0.10.2 2004-07-17
- - add cropping support
- - remove support for ffmpeg<0.4.9-pre1
- - change configure.ac and Makefile.am to better build with
- mingw32
-
-0.10.1 2004-07-15 21:03:15
- - fix problems with mpeg files using ffmpeg from cvs or versions
- newer than 0.4.8.
- - remove --with-ffmpegcvs and detect changes by LIBAVCODEC_BUILD
-
-0.10 2004-07-10 18:14:15
- - write eos at the end of the file.
- - fix memleak due to not enough calls of ogg_stream_pageout
-
-0.9 2004-07-04 13:14:15
- - add presets
- - add more comandline options
-
-0.8 2004-06-19 18:47:14
- - use ffmpeg aspect ration if possible
- - normalize quality options to 0-10
- - fix skipping issues with a/v sync
-
-0.7.1 2004-05-31 01:55:40
- - added --enable-ffmpegcvs to link against ffmpeg from cvs
- - try to find and link to shared avcodec/avformat
- if source not found
-
-0.7 2004-05-30 18:40:40
- - add comandline options for audio/video quality
- - fix bug causing crashes with DV files, without resizing
- - use autotools
-
-0.6 2004-05-06 13:47:30
- - added resize option
-
-0.5.1 2004-03-27 21:59:40
- - fix kino export
- - add -f fmt do define input format.
-
-0.5 2004-03-27 19:59:40
- - link against shared library on linux
- - kino export module and support to read from stdin
- [works only to some extend for now]
-
-0.4
- - fix wrong deinterlaceing
- - change memory allocation to work with mingw32
-
-0.3
- - make encoding of audio only files possible.
- can be used to transcode audio files[mp4,wav,ac3...] to ogg vorbis now
- time to call if ffmpeg2ogg?
- - some code cleanup
-
-0.2
- - added deinterlace support
-
-0.1
- - initial version
Deleted: trunk/ffmpeg2theora/INSTALL
===================================================================
--- trunk/ffmpeg2theora/INSTALL 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/INSTALL 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,62 +0,0 @@
-Compiling from tarball or subversion:
------------------------
-you need
-- scons (http://www.scons.org/)
-- the latest version of libtheora <http://downloads.xiph.org/releases/theora/>
-- ffmpeg git <http://ffmpeg.org> by running ./get_ffmpeg.sh
- (this script downloads ffmpeg and runs configure and compiles ffmpeg)
-- for subtitles support, libkate <http://code.google.com/p/libkate/>,
- or by running ./get_libkate.sh (this script downloads libkate, and
- builds libkate)
-
-if you did not install ffmpeg but want to staticly link it
-(recomended by ffmpeg developers) update PKG_CONFIG_PATH to
-point to your ffmpeg source:
-
- export PKG_CONFIG_PATH=/path/to/ffmpeg_src:$PKG_CONFIG_PATH
-
-now you can build ffmpeg2theora:
- scons
-
-to make a static binary
- scons static=1
-
-
-Installation
-------------
-install ffmpeg2theora in /usr/local/bin:
-
- scons install
-
-Unless you specify a different prefix,
-you will need root privileges for this, ie.:
-
- sudo scons install
-
-to install to another prefix:
-
- scons install prefix=/usr
-
-vhook suppport
---------------
-
-right now vhooks only work if you install ffmpeg and use
-the installed shared libs. otherwise one gets errors like this:
- undefined symbol: av_read_frame
-this is a known limitation of vhooks in ffmpeg.
-
-subtitles suppport
-------------------
-
-Subtitles for multiple languages can be encoded from one or more utf-8
-SubRip format files (.srt) if you have libkate installed. Subtitles will
-be merged into the output Ogg stream as multiplexed Kate streams.
-
-For example, to encode a video with both German and Italian subtitles:
-
-./ffmpeg2theora -o ouput.ogv --subtitles german.srt --subtitles-language de_DE \
- --subtitles italian.srt --subtitles-language it \
- input.avi
-
-See subtitles.txt for more information on how to add subtitles to your videos.
-
Added: trunk/ffmpeg2theora/MOVED_TO_GIT.XIPH.ORG
===================================================================
--- trunk/ffmpeg2theora/MOVED_TO_GIT.XIPH.ORG (rev 0)
+++ trunk/ffmpeg2theora/MOVED_TO_GIT.XIPH.ORG 2012-11-24 08:27:29 UTC (rev 18722)
@@ -0,0 +1,5 @@
+this repository was migrated to git:
+
+ https://git.xiph.org/?p=ffmpeg2theora.git;a=summary
+
+ git clone git://git.xiph.org/ffmpeg2theora.git
Deleted: trunk/ffmpeg2theora/Makefile
===================================================================
--- trunk/ffmpeg2theora/Makefile 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/Makefile 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,13 +0,0 @@
-all:
- scons
-
-clean:
- scons -c
-
-install:
- scons install $(PREFIX)
-
-dist:
- svn export . ffmpeg2theora-`grep ^pkg_version= SConstruct | cut -d\" -f2`
- tar cjf ffmpeg2theora-`grep ^pkg_version= SConstruct | cut -d\" -f2`.tar.bz2 ffmpeg2theora-`grep ^pkg_version= SConstruct | cut -d\" -f2`
- rm -r ffmpeg2theora-`grep ^pkg_version= SConstruct | cut -d\" -f2`
Deleted: trunk/ffmpeg2theora/README
===================================================================
--- trunk/ffmpeg2theora/README 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/README 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,17 +0,0 @@
-ffmpeg2theora - http://v2v.cc/~j/ffmpeg2theora
-
-with ffmpeg2theora you can convert any file that ffmpeg can
-decode to theora. right now the settings are hardcoded into
-the binary. the idea is to provide ffmpeg2theora as a binary
-along sites like v2v.cc to enable as many people as possible
-to encode video clips with the same settings.
-
-usage right now:
- ./ffmpeg2theora clip.avi
- will produce clip.ogv
- for more options run ffmpeg2theora -h
-
- there is a export plugin for kino (http://kino.schirmacher.de/)
- more info in kino_export/README
-
- subtitles can be embedded in an ogg stream, see subtitles.txt for more info.
Deleted: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/SConstruct 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,228 +0,0 @@
-# SCons build specification
-# vi:si:et:sw=2:sts=2:ts=2
-from glob import glob
-import os
-
-import SCons
-
-def version():
- f = os.popen("./version.sh")
- version = f.read().strip()
- f.close()
- return version
-
-pkg_version="0.29"
-
-pkg_name="ffmpeg2theora"
-
-scons_version=(1,2,0)
-
-try:
- EnsureSConsVersion(*scons_version)
-except TypeError:
- print 'SCons %d.%d.%d or greater is required, but you have an older version' % scons_version
- Exit(2)
-
-opts = Variables()
-opts.AddVariables(
- BoolVariable('static', 'Set to 1 for static linking', 0),
- BoolVariable('debug', 'Set to 1 to enable debugging', 0),
- BoolVariable('build_ffmpeg', 'Set to 1 to build local copy of ffmpeg', 0),
- ('prefix', 'install files in', '/usr/local'),
- ('bindir', 'user executables', 'PREFIX/bin'),
- ('mandir', 'man documentation', 'PREFIX/man'),
- ('destdir', 'extra install time prefix', ''),
- ('APPEND_CCFLAGS', 'Additional C/C++ compiler flags'),
- ('APPEND_LINKFLAGS', 'Additional linker flags'),
- BoolVariable('libkate', 'enable libkate support', 1),
- BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
-)
-env = Environment(options = opts)
-Help(opts.GenerateHelpText(env))
-
-pkg_flags="--cflags --libs"
-if env['static']:
- pkg_flags+=" --static"
- env.Append(LINKFLAGS=["-static"])
-
-if env['crossmingw']:
- env.Tool('crossmingw', toolpath = ['scons-tools'])
-
-prefix = env['prefix']
-if env['destdir']:
- if prefix.startswith('/'): prefix = prefix[1:]
- prefix = os.path.join(env['destdir'], prefix)
-man_dir = env['mandir'].replace('PREFIX', prefix)
-bin_dir = env['bindir'].replace('PREFIX', prefix)
-
-env.Append(CPPPATH=['.'])
-env.Append(CCFLAGS=[
- '-DPACKAGE_VERSION=\\"%s\\"' % pkg_version,
- '-DPACKAGE_STRING=\\"%s-%s\\"' % (pkg_name, pkg_version),
- '-DPACKAGE=\\"%s\\"' % pkg_name,
- '-D_FILE_OFFSET_BITS=64'
-])
-
-env.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))
-env.Append(LINKFLAGS = Split('$APPEND_LINKFLAGS'))
-
-if env['debug'] and env['CC'] == 'gcc':
- env.Append(CCFLAGS=["-g", "-O2", "-Wall"])
-
-if GetOption("help"):
- Return()
-
-def ParsePKGConfig(env, name):
- if os.environ.get('PKG_CONFIG_PATH', ''):
- action = 'PKG_CONFIG_PATH=%s pkg-config %s "%s"' % (os.environ['PKG_CONFIG_PATH'], pkg_flags, name)
- else:
- action = 'pkg-config %s "%s"' % (pkg_flags, name)
- return env.ParseConfig(action)
-
-def TryAction(action):
- import os
- ret = os.system(action)
- if ret == 0:
- return (1, '')
- return (0, '')
-
-def CheckPKGConfig(context, version):
- context.Message( 'Checking for pkg-config... ' )
- ret = TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
- context.Result( ret )
- return ret
-
-def CheckPKG(context, name):
- context.Message( 'Checking for %s... ' % name )
- if os.environ.get('PKG_CONFIG_PATH', ''):
- action = 'PKG_CONFIG_PATH=%s pkg-config --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], name)
- else:
- action = 'pkg-config --exists "%s"' % name
- ret = TryAction(action)[0]
- context.Result( ret )
- return ret
-
-env.PrependENVPath ('PATH', os.environ['PATH'])
-
-conf = Configure(env, custom_tests = {
- 'CheckPKGConfig' : CheckPKGConfig,
- 'CheckPKG' : CheckPKG,
-})
-
-if env["build_ffmpeg"]:
- if env.GetOption('clean'):
- TryAction("cd ffmpeg;make distclean")
- else:
- TryAction("./build_ffmpeg.sh")
-
-if not env.GetOption('clean'):
- pkgconfig_version='0.15.0'
- if not conf.CheckPKGConfig(pkgconfig_version):
- print 'pkg-config >= %s not found.' % pkgconfig_version
- Exit(1)
-
- if not conf.CheckPKG("ogg >= 1.1"):
- print 'ogg >= 1.1 missing'
- Exit(1)
-
- if not conf.CheckPKG("vorbis"):
- print 'vorbis missing'
- Exit(1)
-
- if not conf.CheckPKG("vorbisenc"):
- print 'vorbisenc missing'
- Exit(1)
-
- if not conf.CheckPKG("theoraenc >= 1.1.0"):
- print 'theoraenc >= 1.1.0 missing'
- Exit(1)
-
- XIPH_LIBS="ogg >= 1.1 vorbis vorbisenc theoraenc >= 1.1.0"
-
- if not conf.CheckPKG(XIPH_LIBS):
- print 'some xiph libs are missing, ffmpeg2theora depends on %s' % XIPH_LIBS
- Exit(1)
- ParsePKGConfig(env, XIPH_LIBS)
-
- FFMPEG_LIBS=[
- "libavdevice",
- "libavformat",
- "libavfilter",
- "libavcodec >= 52.30.0",
- "libpostproc",
- "libswscale",
- "libswresample",
- "libavutil",
- ]
- if os.path.exists("./ffmpeg"):
- pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
- pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
- os.environ['PKG_CONFIG_PATH'] = ':'.join(pkg_path)
- env.Append(CCFLAGS=[
- '-Iffmpeg'
- ])
- for lib in FFMPEG_LIBS:
- lib = lib.split(' ')[0]
- env.Append(LINKFLAGS=[
- '-Lffmpeg/' + lib
- ])
-
-
- if not conf.CheckPKG(' '.join(FFMPEG_LIBS)):
- print """
- Could not find %s.
- You can install it via
- sudo apt-get install %s
- or update PKG_CONFIG_PATH to point to ffmpeg's source folder
- or run ./get_ffmpeg.sh (for more information see INSTALL)
- """ %(" ".join(FFMPEG_LIBS), " ".join(["%s-dev"%l.split()[0] for l in FFMPEG_LIBS]))
- Exit(1)
-
- for lib in FFMPEG_LIBS:
- ParsePKGConfig(env, lib)
-
- if conf.CheckCHeader('libavformat/framehook.h'):
- env.Append(CCFLAGS=[
- '-DHAVE_FRAMEHOOK'
- ])
-
- KATE_LIBS="oggkate"
- if env['libkate']:
- if os.path.exists("./libkate/misc/pkgconfig"):
- os.environ['PKG_CONFIG_PATH'] = "./libkate/misc/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '')
- if os.path.exists("./libkate/pkg/pkgconfig"):
- os.environ['PKG_CONFIG_PATH'] = "./libkate/pkg/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '')
- if conf.CheckPKG(KATE_LIBS):
- ParsePKGConfig(env, KATE_LIBS)
- env.Append(CCFLAGS=['-DHAVE_KATE', '-DHAVE_OGGKATE'])
- else:
- print """
- Could not find libkate. Subtitles support will be disabled.
- You can also run ./get_libkate.sh (for more information see INSTALL)
- or update PKG_CONFIG_PATH to point to libkate's source folder
- """
-
- if conf.CheckCHeader('iconv.h'):
- env.Append(CCFLAGS=[
- '-DHAVE_ICONV'
- ])
- if conf.CheckLib('iconv'):
- env.Append(LIBS=['iconv'])
-
- if env['crossmingw']:
- env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
- env.Append(LIBS=['m'])
- elif env['static']:
- env.Append(LIBS=['m', 'dl'])
-
-
-env = conf.Finish()
-
-# ffmpeg2theora
-ffmpeg2theora = env.Clone()
-ffmpeg2theora_sources = glob('src/*.c')
-ffmpeg2theora.Program('ffmpeg2theora', ffmpeg2theora_sources)
-
-ffmpeg2theora.Install(bin_dir, 'ffmpeg2theora')
-ffmpeg2theora.Install(man_dir + "/man1", 'ffmpeg2theora.1')
-ffmpeg2theora.Alias('install', prefix)
Deleted: trunk/ffmpeg2theora/TODO
===================================================================
--- trunk/ffmpeg2theora/TODO 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/TODO 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,3 +0,0 @@
-- remove global variable info
-- more commandline options
-- add option for pixel aspect ratio
Deleted: trunk/ffmpeg2theora/build_ffmpeg.sh
===================================================================
--- trunk/ffmpeg2theora/build_ffmpeg.sh 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/build_ffmpeg.sh 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,25 +0,0 @@
-#!/bin/sh
-. ./ffmpegrev
-
-
-common="--enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
-
-#optional, if you have those libs installed(requires GPL3):
-#extra="$extra --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
-
-#apt-get install liba52-dev libgsm1-dev
-#extra="$extra --enable-libgsm"
-
-#optional, if you have libvpx installed:
-#extra="$extra --enable-libvpx"
-
-#linux
-options="$common --enable-pthreads $extra"
-
-#mingw32
-uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
-
-#configure and build ffmpeg
-cd $FFMPEG_CO_DIR && ./configure $options && make -j8
-
Deleted: trunk/ffmpeg2theora/ffmpeg2theora.1
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.1 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/ffmpeg2theora.1 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,334 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.TH FFMPEG2THEORA 1 "May 14, 2010"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ffmpeg2theora \- command-line converter to create Ogg Theora and Ogg
-Vorbis files.
-.SH SYNOPSIS
-.B ffmpeg2theora
-.RI [ options ] " inputfile"
-.SH DESCRIPTION
-This manual page documents briefly the \fBffmpeg2theora\fP command.
-.PP
-\fBffmpeg2theora\fP is a program that converts any media file that ffmpeg can
-decode to Ogg Theora for video and Ogg Vorbis for audio.
-.SH OPTIONS
-To read from standard input, specify `\-' as the input filename.
-
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.SS General output options:
-.TP
-.B \-o, \-\-output
-Specify the output filename. If no output filename is specified, output will
-be written to \fIinputfile\fP.ogv. To output to standard output, specify
-/dev/stdout as the output file.
-.TP
-.B \-\-no-skeleton
-Disables Ogg Skeleton metadata output.
-.TP
-.B \-\-seek-index
-Enables keyframe index in skeleton track.
-.TP
-.B \-s, \-\-starttime
-Start encoding at this time (in seconds).
-.TP
-.B \-e, \-\-endtime
-End encoding at this time (in seconds).
-.TP
-.B \-p, \-\-preset
-Encode file with v2v preset. Right now, there is preview, pro and videobin. Run
-\*(lqffmpeg2theora \-p info\*(rq for more information.
-.SS Video output options:
-.TP
-.B \-v, \-\-videoquality
-[0 to 10] Set encoding quality for video (default: 6).
- use higher values for better quality
-.TP
-.B \-V, \-\-videobitrate
-Set encoding bitrate for video (in kb/s).
-.TP
-.B \-\-soft\-target
-Use a large reservoir and treat the rate
-as a soft target; rate control is less
-strict but resulting quality is usually
-higher/smoother overall. Soft target also
-allows an optional \-v setting to specify
-a minimum allowed quality.
-.TP
-.B \-\-two-pass
-Compress input using two-pass rate control.
-This option requires that the input to the
-to the encoder is seekable and performs both passes automatically.
-.TP
-.B \-\-first-pass <filename>
-Perform first-pass of a two-pass rate controlled encoding,
-saving pass data to <filename> for a later second pass
-.TP
-.B \-\-second-pass <filename>
-Perform second-pass of a two-pass rate controlled encoding, reading first-pass
-data from <filename>. The first pass data must come from a first encoding pass
-using identical input video to work properly.
-
-.TP
-.B \-\-optimize
-Optimize output Theora video, using a full search for motion vectors
-instead of a hierarchical one. This can reduce video bitrate about 5%,
-but it is slower and therefore is disabled by default.
-.TP
-.B \-\-speedlevel
-encoding is faster with higher values
-the cost is quality and bandwidth (default 1)
-available values depend on the version of libtheora
-check ffmpeg2theora --help for supported values.
-.TP
-.B \-x, \-\-width
-Scale to given width (in pixels).
-.TP
-.B \-y, \-\-height
-Scale to given height (in pixels).
-.TP
-.B \-\-aspect
-Define frame aspect ratio (e.g. 4:3, 16:9).
-.TP
-.B \-\-pixel\-aspect
-Define pixel aspect ratio (e.g. 1:1, 4:3).
-.TP
-.B \-F, \-\-framerate
-output framerate e.g 25:2 or 16
-.TP
-.B \-\-croptop, \-\-cropbottom, \-\-cropleft, \-\-cropright
-Crop input by given pixels before resizing.
-.TP
-.B \-K, \-\-keyint
-[8 to 2147483647] Set keyframe interval (default: 64).
-.TP
-.B \-d, \-\-buf-delay
-Buffer delay (in frames). Longer delays
-allow smoother rate adaptation and provide
-better overall quality, but require more
-client side buffering and add latency. The
-default value is the keyframe interval for
-one-pass encoding (or somewhat larger if
-\-\-soft\-target is used) and infinite for
-two\-pass encoding. (only works in bitrate mode)
-.TP
-.B \-\-no-upscaling
-only scale video or resample audio if input is
-bigger than provided parameter
-.SS Video transfer options:
-.TP
-.B \-\-pp
-Video Postprocessing, denoise, deblock, deinterlacer
-use \-\-pp help for a list of available filters.
-.TP
-.B \-C, \-\-contrast
-[0.1 to 10.0] contrast correction (default: 1.0). Note: lower values make the video darker.
-.TP
-.B \-B, \-\-brightness
-[-1.0 to 1.0] brightness correction (default: 0.0). Note: lower values make the video darker.
-.TP
-.B \-G, \-\-gamma
-[0.1 to 10.0] gamma correction (default: 1.0). Note: lower values make the video darker.
-.TP
-.B \-P, \-\-saturation
-[0.1 to 10.0] saturation correction (default: 1.0). Note: lower values make the video grey.
-.SS Audio output options:
-.TP
-.B \-a, \-\-audioquality
-[-2 to 10] Set encoding quality for audio (default: 1).
- use higher values for better quality
-.TP
-.B \-A, \-\-audiobitrate
-[32 to 500] Set encoding bitrate for audio (in kb/s).
-.TP
-.B \-c, \-\-channels
-Set number of output channels.
-.TP
-.B \-H, \-\-samplerate
-Set output samplerate (in Hz).
-.SS Input options:
-.TP
-.B \-\-noaudio
-Disable audio from input.
-.TP
-.B \-\-novideo
-Disable video from input.
-.TP
-.B \-\-deinterlace
-Force deinterlace. Otherwise only material marked as interlaced will be
-deinterlaced.
-.TP
-.B \-\-no-deinterlace
-Force deinterlace off.
-.TP
-.B \-\-vhook
-you can use ffmpeg's vhook system, example:
- ffmpeg2theora \-\-vhook '/path/watermark.so \-f wm.gif' input.dv
-.TP
-.B \-f, \-\-format
-Specify input format.
-.TP
-.B \-\-inputfps
-Override input fps.
-.TP
-.B \-\-audiostream id
-By default the first audio stream is selected, use this to select
-another audio stream.
-.TP
-.B \-\-videostream id
-By default the first video stream is selected, use this to select
-another audio stream.
-.TP
-.B \-\-sync
-Use A/V sync from input container. Since this does not work with
-all input format you have to manualy enable it if you have
-issues with A/V sync.
-.SS Subtitles options:
-.TP
-.B \-\-subtitles
-Encode subtitles from the given file to a multiplexed Kate stream.
-The input file should be in SubRip (.srt) format, encoded in UTF-8,
-unless the --subtitles-encoding option is also given.
-.TP
-.B \-\-subtitles-encoding encoding
-Assumes the corresponding subtitles file is encoded in the given
-encoding. If ffmpeg2theora was built with iconv support, all
-encodings supported by iconv may be used. Otherwise, UTF-8 and
-ISO-8859-1 (aka latin1) are supported. The default is UTF-8.
-.TP
-.B \-\-subtitles-language language
-Sets the language of the corresponding subtitles stream. This will
-be set in the corresponding Kate stream so a video player may make
-this available to the user for language selection. Language is an
-ISO 639-1 or RFC 3066 ASCII string and is limited to 15 characters.
-.TP
-.B \-\-subtitles-category category
-Sets the category of the corresponding subtitles stream. This will
-be set in the corresponding Kate stream so a video player may make
-this available to the user for selection. The default category is
-"subtitles". Suggested other categories may include "transcript",
-"commentary", "lyrics", etc. Category is an ASCII string and is
-limited to 15 characters
-.TP
-.B \-\-subtitles-ignore-non-utf8
-When reading an UTF-8 subtitles text file, any invalid UTF-8 sequence
-will be ignored. This may be useful if there are stray sequences in
-an otherwise UTF-8 file. Note that, since those invalid sequences
-will be removed from the output, this option is not a substitute to
-converting a non UTF-8 file to UTF-8.
-.TP
-.B \-\-nosubtitles
-Disables subtitles from input.
-Note that subtitles explicitely loaded from external files will still
-be used.
-.TP
-.B \-\-subtitle-types
-Selects which subtitle types to include from the input file.
-Allowed types are: none, all, text, spu (spu being the image based
-subtitles found on DVD).
-By default, only text based subtitles will be included.
-Note that subtitles explicitely loaded from external files will still
-be used.
-.SS Metadata options:
-.TP
-.B \-\-artist
-Name of artist (director).
-.TP
-.B \-\-title
-Title.
-.TP
-.B \-\-date
-Date.
-.TP
-.B \-\-location
-Location.
-.TP
-.B \-\-organization
-Name of organization (studio).
-.TP
-.B \-\-copyright
-Copyright.
-.TP
-.B \-\-license
-License.
-.TP
-.B \-\-contact
-Contact link.
-.TP
-.B \-\-nometadata
-disables metadata from input
-.TP
-.B \-\-no\-oshash
-do not include oshash of source file(SOURCE_OSHASH)
-
-.SS Keyframe indexing options:
-.TP
-.B \-\-index-interval <n>
-set minimum distance between indexed keyframes
-to <n> ms (default: 2000)
-.TP
-.B \-\-theora\-index\-reserve <n>
-reserve <n> bytes for theora keyframe index
-.TP
-.B \-\-vorbis\-index\-reserve <n>
-reserve <n> bytes for vorbis keyframe index
-.TP
-.B \-\-kate\-index\-reserve <n>
-reserve <n> bytes for kate keyframe index
-
-.SS Other options:
-.TP
-.B \-\-nice n
-Set niceness to n.
-.TP
-.B \-h, \-\-help
-Output a help message.
-.TP
-.B \-\-info
-Output json info about input file, use -o to save json to file.
-.TP
-.B \-\-frontend
-print status information in json, one json dict per line
-.SH EXAMPLES
-Encode Videos:
- ffmpeg2theora videoclip.avi (will write output to videoclip.ogv)
-
- cat something.dv | ffmpeg2theora -f dv -o output.ogv \-
-
-Encode a series of images:
- ffmpeg2theora frame%06d.png -o output.ogv
-
-Live streaming from V4L Device:
- ffmpeg2theora \-\-no\-skeleton /dev/video0 \-f video4linux \\
- \-\-inputfps 15 \-x 160 \-y 128 \\
- \-o \- | oggfwd icast2server 8000 password /theora.ogv
-
- (you might have to use video4linux2 depending on your hardware)
-
-Live encoding from a DV camcorder (needs a fast machine):
- dvgrab - | ffmpeg2theora -f dv -x 352 -y 288 -o output.ogv -\n"
-
-Live encoding and streaming to icecast server:
- dvgrab \-\-format raw \- \\
- | ffmpeg2theora \-\-no\-skeleton \-f dv \-x 160 \-y 128 \-o /dev/stdout \- \\
- | oggfwd icast2server 8000 password /theora.ogv
-
-
-.SH AUTHOR
-ffmpeg2theora was written by jan gerber <j at v2v.cc>.
-.PP
-This manual page was written by Hubert Chan <hubert at uhoreg.ca>,
-for the Debian project (but may be used by others).
Deleted: trunk/ffmpeg2theora/ffmpegrev
===================================================================
--- trunk/ffmpeg2theora/ffmpegrev 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/ffmpegrev 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,3 +0,0 @@
-FFMPEG_CO_DIR=ffmpeg
-FFMPEG_URL=git://git.videolan.org/ffmpeg
-#FFMPEG_REVISION=54bc6403620286f595becd01842947395020e2f4
Deleted: trunk/ffmpeg2theora/get_ffmpeg.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg.sh 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/get_ffmpeg.sh 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,25 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-
-# load FFMPEG specific properties
-. ./ffmpegrev
-
-test -e $FFMPEG_CO_DIR || git clone --depth 1 $FFMPEG_URL $FFMPEG_CO_DIR
-cd $FFMPEG_CO_DIR
-#git pull -r $FFMPEG_REVISION
-#git checkout release/0.7
-git checkout master
-git pull
-cd ..
-
-apply_patches() {
- cd $FFMPEG_CO_DIR
- for patch in ../patches/*.patch; do
- patch -p0 < $patch
- done
- touch .ffmpeg2theora_patched
- cd ..
-}
-
-./build_ffmpeg.sh
-
Deleted: trunk/ffmpeg2theora/get_libkate.sh
===================================================================
--- trunk/ffmpeg2theora/get_libkate.sh 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/get_libkate.sh 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-version=0.4.1
-baseurl="http://libkate.googlecode.com/files/libkate-$version.tar.gz"
-
-which wget >& /dev/null
-if [ $? -eq 0 ]
-then
- test -e "libkate-$version.tar.gz" || wget "$baseurl"
-else
- which curl >& /dev/null
- if [ $? -eq 0 ]
- then
- test -e "libkate-$version.tar.gz" || curl "$baseurl" -o "libkate-$version.tar.gz"
- else
- echo "Neither wget nor curl were found, cannot download libkate"
- exit 1
- fi
-fi
-
-if [ $? -ne 0 ]
-then
- echo "Failed to download libkate"
- exit 1
-fi
-
-tar xfz "libkate-$version.tar.gz"
-test -L libkate && rm libkate
-ln -fs "libkate-$version" libkate
-cd libkate && ./configure && make && cd lib
-
Deleted: trunk/ffmpeg2theora/subtitles.txt
===================================================================
--- trunk/ffmpeg2theora/subtitles.txt 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/subtitles.txt 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,162 +0,0 @@
-Text subtitles can be embedded in an Ogg stream alongside a Theora video.
-
- * Overview
- * Subtitles related options
- * Converting non-UTF-8 files to UTF-8
- * Examples
- * Playing subtitles
-
-
-
- * Overview
-
-Subtitles are read from SubRip (.srt) format files and converted to
-Kate streams. Those SubRip files must be encoded in UTF-8 (7 bit ASCII
-is a subset of UTF-8 so is valid input as well). See below for more
-information on converting SubRip files with other encodings to UTF-8.
-ffmpeg2theora can convert files to UTF-8 transparently if build with
-a C library that supports iconv.
-
-Subtitles support requires libkate, available from:
-http://code.google.com/p/libkate
-
-A subtitles input file is given with the --subtitles option.
-The language of subtitles in a file is given by the --subtitles-language
-option. See below for a list of subtitles related options. At the most
-simple, supplying a single input file:
-
- ./ffmpeg2theora -o output.ogv --subtitles input.srt input.avi
-
-Any number of subtitles streams can be multiplexed, presumably with
-different languages and/or categories. See below for examples of this.
-
-Additionally, text subtitles from the input stream may also be used.
-Use --nosubtitles if those are not to be converted.
-
-
-
- * Subtitles related options
-
---subtitles <file>
- Loads subtitles from a file, which must be an UTF-8 encoded SubRip
- (.srt) file
-
---subtitles-language <language>
- Sets the language of the relevant subtitles stream. Language must be
- a language tag according to RFC 3066 (usually a two letter language
- code, optionally followed by a dash (or underscore) and a region code.
- Examples include en, it, ja, en_GB, de_DE, etc.
- If unspecified, the default is to not set a language. It is however
- strongly encouraged to set the language.
-
---subtitles-category <category>
- Sets the category of the relevant subtitles stream. Category must be
- a free text string describing the type of the subtitles streams. This
- is meant to be parsable automatically, so should be ASCII only, and
- preferably among a list of predefined well known categories, such as
- subtitles, commentary, transcript, lyrics.
- If unspecified, the default is subtitles.
-
---subtitles-encoding <encoding>
- Sets the encoding of the relevant input file. Allowed encodings are
- UTF-8, UTF8, iso-8859-1, and latin1. The first two are synonymous and
- yield no conversion. The latter two are synonymous and convert from
- iso-8859-1 to UTF-8.
- If the input file is in another encoding, a separate step is needed
- to convert the input file to UTF-8. See below for more information on
- converting other encoding to UTF-8.
- If unspecified, the default is UTF-8.
-
---subtitles-ignore-non-utf8
- Any invalid sequence in UTF-8 text will be ignored. This may be useful
- when using an UTF-8 file with stray non UTF-8 characters. This is not
- a substitute for converting a non UTF-8 file to UTF-8, however, as the
- non UTF-8 sequence will be missing from the output stream.
-
---nosubtitles
- Subtitle streams from the input file will not be converted. Subtitles
- from any supplied --subtitles option will still be used.
-
---subtitle-types <types>
- By default, only text based subtitles found in the input file are
- included in the output file. This option allows selecting which types
- are to be included: none, all, text, or spu (spu being the type of
- image-based subtitles found on DVDs).
-
-
-
- * Converting non-UTF-8 files to UTF-8
-
-If ffmpeg2theora wasn't build with iconv support, only UTF-8 and latin1
-input text is supported.
-If you have SubRip files in another format than UTF-8, you can use the
-iconv or recode programs to convert them to UTF-8 so ffmpeg2theora can
-read them.
-
- * iconv
- If you have a file called subtitles.srt which is not in UTF-8,
- you can convert it to UTF-8 with the command:
-
- iconv -t utf-8 -f ENCODING subtitles.srt > subtitles.utf8.srt
-
- Substitute ENCODING with the actual encoding of the input file.
- For instance, if your input file is in Shift-JIS encoding, replace
- ENCODING with SHIFT-JIS. If your input file is in big endian UCS2
- encoding, replace ENCODING with UCS-2BE.
-
- This will create a new file called subtitles.utf8.srt, which will
- be the equivalent of the input file, but in UTF-8 format, so it
- can be used as input to ffmpeg2theora.
-
- To view a list of all the encodings iconv can convert to UTF-8,
- see the output of `iconv -l'.
-
- * recode
-
- If you have a file called subtitles.srt which is not in UTF-8,
- you can convert it to UTF-8 with the command:
-
- recode ENCODING..UTF-8 < subtitles.srt > subtitles.utf8.srt
-
- Substitute ENCODING with the actual encoding of the input file.
- For instance, if your input file is in Shift-JIS encoding, replace
- ENCODING with SHIFT-JIS. If your input file is in BIG5 encoding,
- replace ENCODING with BIG5.
-
- This will create a new file called subtitles.utf8.srt, which will
- be the equivalent of the input file, but in UTF-8 format, so it
- can be used as input to ffmpeg2theora.
-
- To view a list of all the encodings recode can convert to UTF-8,
- see the output of `recode -l'.
-
-
- * Examples
-
- Add a single English subtitles stream:
-
- ./ffmpeg2theora --subtitles-language en --subtitles input.srt input.avi
-
- Add German and Italian commentary:
-
- ./ffmpeg2theora --subtitles comm.german.srt --subtitles-language de \
- --subtitles-category commentary \
- --subtitles comm.italian.srt --subtitles-language it \
- --subtitles-category commentary \
- input.avi
-
- Add English subtitles and commentary:
-
- ./ffmpeg2theora --subtitles subs.srt --subtitles-language en \
- --subtitles-category subtitles \
- --subtitles commentary.srt --subtitles-language en \
- --subtitles-category commentary \
- input.avi
-
-
- * Playing subtitles
-
-At the moment, only VLC has playback support for Kate streams. However, the
-libkate distribution includes patches for other players and media frameworks
-(MPlayer, GStreamer, liboggplay).
-
Deleted: trunk/ffmpeg2theora/version.sh
===================================================================
--- trunk/ffmpeg2theora/version.sh 2012-11-23 23:13:38 UTC (rev 18721)
+++ trunk/ffmpeg2theora/version.sh 2012-11-24 08:27:29 UTC (rev 18722)
@@ -1,11 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-version='0.29'
-test -e .svn && svnversion=`which svnversion`
-echo -n $version
-if [ "x$svnversion" != "x" ]; then
- echo -n "+svn"
- svnversion
-else
- echo
-fi
More information about the commits
mailing list