Projects
Multimedia
ffmpeg2theora
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 5
View file
ffmpeg2theora.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun May 27 00:00:00 UTC 2012 - Manfred.Tremmel@iiv.de + +- updates from svn to get it work with ffmpeg 0.11 + +------------------------------------------------------------------- Thu Mar 15 17:00:45 UTC 2012 - jw@suse.de - build failed due to api changes in ffmpeg. Adding suggested patch from
View file
ffmpeg2theora.spec
Changed
@@ -13,7 +13,7 @@ URL: http://v2v.cc/~j/ffmpeg2theora/index.html Source0: http://v2v.cc/~j/ffmpeg2theora/%{name}-%{version}.tar.bz2 Patch0: ffmpeg2theora-fix-include-path.patch -Patch1: lp_509_508_jw.diff +Patch1: ffmpeg2theora-ffmpeg11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -32,10 +32,11 @@ %setup -q # Patch0: ffmpeg2theora-fix-include-path.patch %patch0 -p1 -# Patch1: lp_509_508_jw.diff +# Patch1: ffmpeg2theora-ffmpeg11.patch %patch1 -p1 %build +export LDFLAGS="$LDFLAGS -lm" scons prefix=%{_prefix} APPEND_CCFLAGS="%{optflags}" %install @@ -52,35 +53,4 @@ %doc %{_mandir}/man1/ffmpeg2theora.1* %changelog -* Sun Jul 31 2011 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.28-0.pm.1 -- updated to version 0.28 -* Sat Jun 19 2010 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.27-0.pm.1 -- updated to version 0.27 -* Sat Feb 06 2010 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.26-0.pm.1 -- updated to version 0.26 -* Sat Oct 17 2009 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.25-0.pm.1 -- updated to version 0.25 -* Sun Sep 06 2009 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.24-1.pm.1 -- cleanups where rpmlint wasn't so happy -* Sat Mar 28 2009 - Manfred.Tremmel@iiv.de -- updated to version 0.24 -* Fri Nov 28 2008 - anschneider@suse.de -- updated to version 0.22 - * 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. -* Wed Jul 23 2008 - guru@unixtech.be -- new upstream version: 0.21 -- added support for libkate -* Wed Jul 23 2008 - guru@unixtech.be -- added debug_package -- build on 11.0 -- added missing BuildRequires: libmp3lame-devel -* Thu Dec 20 2007 - Manfred.Tremmel@iiv.de -- added a patch to build with latest ffmpeg version -* Thu Nov 08 2007 - andreas@links2linux.de -- initial package version 0.19 +
View file
ffmpeg2theora-ffmpeg11.patch
Added
@@ -0,0 +1,1714 @@ +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/build_ffmpeg.sh ffmpeg2theora/build_ffmpeg.sh +--- ffmpeg2theora-0.28.orig/build_ffmpeg.sh 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg2theora/build_ffmpeg.sh 2012-05-27 02:20:15.247986935 +0200 +@@ -0,0 +1,25 @@ ++#!/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 ++ +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/ChangeLog ffmpeg2theora/ChangeLog +--- ffmpeg2theora-0.28.orig/ChangeLog 2011-07-30 21:55:10.000000000 +0200 ++++ ffmpeg2theora/ChangeLog 2012-05-27 02:20:15.246986961 +0200 +@@ -1,3 +1,9 @@ ++svn 2011-09-15 ++ - 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 +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/COPYING ffmpeg2theora/COPYING +--- ffmpeg2theora-0.28.orig/COPYING 2009-11-28 15:00:35.000000000 +0100 ++++ ffmpeg2theora/COPYING 2012-05-27 02:20:15.249986882 +0200 +@@ -1,627 +1,285 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- GNU GENERAL PUBLIC LICENSE +- Version 3, 29 June 2007 +- +- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> ++ 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 GNU General Public License is a free, copyleft license for +-software and other kinds of works. ++ Preamble + +- The licenses for most software and other practical works are designed +-to take away your freedom to share and change the works. By contrast, +-the GNU General Public License is intended to guarantee your freedom to +-share and change all versions of a program--to make sure it remains free +-software for all its users. We, the Free Software Foundation, use the +-GNU General Public License for most of our software; it applies also to +-any other work released this way by its authors. You can apply it to ++ 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 +-them 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 prevent others from denying you +-these rights or asking you to surrender the rights. Therefore, you have +-certain responsibilities if you distribute copies of the software, or if +-you modify it: responsibilities to respect the freedom of others. ++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 pass on to the recipients the same +-freedoms that you received. 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. +- +- Developers that use the GNU GPL protect your rights with two steps: +-(1) assert copyright on the software, and (2) offer you this License +-giving you legal permission to copy, distribute and/or modify it. +- +- For the developers' and authors' protection, the GPL clearly explains +-that there is no warranty for this free software. For both users' and +-authors' sake, the GPL requires that modified versions be marked as +-changed, so that their problems will not be attributed erroneously to +-authors of previous versions. +- +- Some devices are designed to deny users access to install or run +-modified versions of the software inside them, although the manufacturer +-can do so. This is fundamentally incompatible with the aim of +-protecting users' freedom to change the software. The systematic +-pattern of such abuse occurs in the area of products for individuals to +-use, which is precisely where it is most unacceptable. Therefore, we +-have designed this version of the GPL to prohibit the practice for those +-products. If such problems arise substantially in other domains, we +-stand ready to extend this provision to those domains in future versions +-of the GPL, as needed to protect the freedom of users. +- +- Finally, every program is threatened constantly by software patents. +-States should not allow patents to restrict development and use of +-software on general-purpose computers, but in those that do, we wish to +-avoid the special danger that patents applied to a free program could +-make it effectively proprietary. To prevent this, the GPL assures that +-patents cannot be used to render the program non-free. ++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. + +- TERMS AND CONDITIONS +- +- 0. Definitions. ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +- "This License" refers to version 3 of the GNU General Public License. +- +- "Copyright" also means copyright-like laws that apply to other kinds of +-works, such as semiconductor masks. +- +- "The Program" refers to any copyrightable work licensed under this +-License. Each licensee is addressed as "you". "Licensees" and +-"recipients" may be individuals or organizations. +- +- To "modify" a work means to copy from or adapt all or part of the work +-in a fashion requiring copyright permission, other than the making of an +-exact copy. The resulting work is called a "modified version" of the +-earlier work or a work "based on" the earlier work. +- +- A "covered work" means either the unmodified Program or a work based +-on the Program. +- +- To "propagate" a work means to do anything with it that, without +-permission, would make you directly or secondarily liable for +-infringement under applicable copyright law, except executing it on a +-computer or modifying a private copy. Propagation includes copying, +-distribution (with or without modification), making available to the +-public, and in some countries other activities as well. +- +- To "convey" a work means any kind of propagation that enables other +-parties to make or receive copies. Mere interaction with a user through +-a computer network, with no transfer of a copy, is not conveying. +- +- An interactive user interface displays "Appropriate Legal Notices" +-to the extent that it includes a convenient and prominently visible +-feature that (1) displays an appropriate copyright notice, and (2) +-tells the user that there is no warranty for the work (except to the +-extent that warranties are provided), that licensees may convey the +-work under this License, and how to view a copy of this License. If +-the interface presents a list of user commands or options, such as a +-menu, a prominent item in the list meets this criterion. +- +- 1. Source Code. +- +- The "source code" for a work means the preferred form of the work +-for making modifications to it. "Object code" means any non-source +-form of a work. +- +- A "Standard Interface" means an interface that either is an official +-standard defined by a recognized standards body, or, in the case of +-interfaces specified for a particular programming language, one that +-is widely used among developers working in that language. +- +- The "System Libraries" of an executable work include anything, other +-than the work as a whole, that (a) is included in the normal form of +-packaging a Major Component, but which is not part of that Major +-Component, and (b) serves only to enable use of the work with that +-Major Component, or to implement a Standard Interface for which an +-implementation is available to the public in source code form. A +-"Major Component", in this context, means a major essential component +-(kernel, window system, and so on) of the specific operating system +-(if any) on which the executable work runs, or a compiler used to +-produce the work, or an object code interpreter used to run it. +- +- The "Corresponding Source" for a work in object code form means all +-the source code needed to generate, install, and (for an executable +-work) run the object code and to modify the work, including scripts to +-control those activities. However, it does not include the work's +-System Libraries, or general-purpose tools or generally available free +-programs which are used unmodified in performing those activities but +-which are not part of the work. For example, Corresponding Source +-includes interface definition files associated with source files for +-the work, and the source code for shared libraries and dynamically +-linked subprograms that the work is specifically designed to require, +-such as by intimate data communication or control flow between those +-subprograms and other parts of the work. +- +- The Corresponding Source need not include anything that users +-can regenerate automatically from other parts of the Corresponding +-Source. +- +- The Corresponding Source for a work in source code form is that +-same work. +- +- 2. Basic Permissions. +- +- All rights granted under this License are granted for the term of +-copyright on the Program, and are irrevocable provided the stated +-conditions are met. This License explicitly affirms your unlimited +-permission to run the unmodified Program. The output from running a +-covered work is covered by this License only if the output, given its +-content, constitutes a covered work. This License acknowledges your +-rights of fair use or other equivalent, as provided by copyright law. +- +- You may make, run and propagate covered works that you do not +-convey, without conditions so long as your license otherwise remains +-in force. You may convey covered works to others for the sole purpose +-of having them make modifications exclusively for you, or provide you +-with facilities for running those works, provided that you comply with +-the terms of this License in conveying all material for which you do +-not control copyright. Those thus making or running the covered works +-for you must do so exclusively on your behalf, under your direction +-and control, on terms that prohibit them from making any copies of +-your copyrighted material outside their relationship with you. +- +- Conveying under any other circumstances is permitted solely under +-the conditions stated below. Sublicensing is not allowed; section 10 +-makes it unnecessary. +- +- 3. Protecting Users' Legal Rights From Anti-Circumvention Law. +- +- No covered work shall be deemed part of an effective technological +-measure under any applicable law fulfilling obligations under article +-11 of the WIPO copyright treaty adopted on 20 December 1996, or +-similar laws prohibiting or restricting circumvention of such +-measures. +- +- When you convey a covered work, you waive any legal power to forbid +-circumvention of technological measures to the extent such circumvention +-is effected by exercising rights under this License with respect to +-the covered work, and you disclaim any intention to limit operation or +-modification of the work as a means of enforcing, against the work's +-users, your or third parties' legal rights to forbid circumvention of +-technological measures. +- +- 4. Conveying Verbatim Copies. +- +- You may convey 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; +-keep intact all notices stating that this License and any +-non-permissive terms added in accord with section 7 apply to the code; +-keep intact all notices of the absence of any warranty; and give all +-recipients a copy of this License along with the Program. +- +- You may charge any price or no price for each copy that you convey, +-and you may offer support or warranty protection for a fee. +- +- 5. Conveying Modified Source Versions. +- +- You may convey a work based on the Program, or the modifications to +-produce it from the Program, in the form of source code under the +-terms of section 4, provided that you also meet all of these conditions: +- +- a) The work must carry prominent notices stating that you modified +- it, and giving a relevant date. +- +- b) The work must carry prominent notices stating that it is +- released under this License and any conditions added under section +- 7. This requirement modifies the requirement in section 4 to +- "keep intact all notices". +- +- c) You must license the entire work, as a whole, under this +- License to anyone who comes into possession of a copy. This +- License will therefore apply, along with any applicable section 7 +- additional terms, to the whole of the work, and all its parts, +- regardless of how they are packaged. This License gives no +- permission to license the work in any other way, but it does not +- invalidate such permission if you have separately received it. +- +- d) If the work has interactive user interfaces, each must display +- Appropriate Legal Notices; however, if the Program has interactive +- interfaces that do not display Appropriate Legal Notices, your +- work need not make them do so. +- +- A compilation of a covered work with other separate and independent +-works, which are not by their nature extensions of the covered work, +-and which are not combined with it such as to form a larger program, +-in or on a volume of a storage or distribution medium, is called an +-"aggregate" if the compilation and its resulting copyright are not +-used to limit the access or legal rights of the compilation's users +-beyond what the individual works permit. Inclusion of a covered work +-in an aggregate does not cause this License to apply to the other +-parts of the aggregate. +- +- 6. Conveying Non-Source Forms. +- +- You may convey a covered work in object code form under the terms +-of sections 4 and 5, provided that you also convey the +-machine-readable Corresponding Source under the terms of this License, +-in one of these ways: +- +- a) Convey the object code in, or embodied in, a physical product +- (including a physical distribution medium), accompanied by the +- Corresponding Source fixed on a durable physical medium +- customarily used for software interchange. +- +- b) Convey the object code in, or embodied in, a physical product +- (including a physical distribution medium), accompanied by a +- written offer, valid for at least three years and valid for as +- long as you offer spare parts or customer support for that product +- model, to give anyone who possesses the object code either (1) a +- copy of the Corresponding Source for all the software in the +- product that is covered by this License, on a durable physical +- medium customarily used for software interchange, for a price no +- more than your reasonable cost of physically performing this +- conveying of source, or (2) access to copy the +- Corresponding Source from a network server at no charge. +- +- c) Convey individual copies of the object code with a copy of the +- written offer to provide the Corresponding Source. This +- alternative is allowed only occasionally and noncommercially, and +- only if you received the object code with such an offer, in accord +- with subsection 6b. +- +- d) Convey the object code by offering access from a designated +- place (gratis or for a charge), and offer equivalent access to the +- Corresponding Source in the same way through the same place at no +- further charge. You need not require recipients to copy the +- Corresponding Source along with the object code. If the place to +- copy the object code is a network server, the Corresponding Source +- may be on a different server (operated by you or a third party) +- that supports equivalent copying facilities, provided you maintain +- clear directions next to the object code saying where to find the +- Corresponding Source. Regardless of what server hosts the +- Corresponding Source, you remain obligated to ensure that it is +- available for as long as needed to satisfy these requirements. +- +- e) Convey the object code using peer-to-peer transmission, provided +- you inform other peers where the object code and Corresponding +- Source of the work are being offered to the general public at no +- charge under subsection 6d. +- +- A separable portion of the object code, whose source code is excluded +-from the Corresponding Source as a System Library, need not be +-included in conveying the object code work. +- +- A "User Product" is either (1) a "consumer product", which means any +-tangible personal property which is normally used for personal, family, +-or household purposes, or (2) anything designed or sold for incorporation +-into a dwelling. In determining whether a product is a consumer product, +-doubtful cases shall be resolved in favor of coverage. For a particular +-product received by a particular user, "normally used" refers to a +-typical or common use of that class of product, regardless of the status +-of the particular user or of the way in which the particular user +-actually uses, or expects or is expected to use, the product. A product +-is a consumer product regardless of whether the product has substantial +-commercial, industrial or non-consumer uses, unless such uses represent +-the only significant mode of use of the product. +- +- "Installation Information" for a User Product means any methods, +-procedures, authorization keys, or other information required to install +-and execute modified versions of a covered work in that User Product from +-a modified version of its Corresponding Source. The information must +-suffice to ensure that the continued functioning of the modified object +-code is in no case prevented or interfered with solely because +-modification has been made. +- +- If you convey an object code work under this section in, or with, or +-specifically for use in, a User Product, and the conveying occurs as +-part of a transaction in which the right of possession and use of the +-User Product is transferred to the recipient in perpetuity or for a +-fixed term (regardless of how the transaction is characterized), the +-Corresponding Source conveyed under this section must be accompanied +-by the Installation Information. But this requirement does not apply +-if neither you nor any third party retains the ability to install +-modified object code on the User Product (for example, the work has +-been installed in ROM). +- +- The requirement to provide Installation Information does not include a +-requirement to continue to provide support service, warranty, or updates +-for a work that has been modified or installed by the recipient, or for +-the User Product in which it has been modified or installed. Access to a +-network may be denied when the modification itself materially and +-adversely affects the operation of the network or violates the rules and +-protocols for communication across the network. +- +- Corresponding Source conveyed, and Installation Information provided, +-in accord with this section must be in a format that is publicly +-documented (and with an implementation available to the public in +-source code form), and must require no special password or key for +-unpacking, reading or copying. +- +- 7. Additional Terms. +- +- "Additional permissions" are terms that supplement the terms of this +-License by making exceptions from one or more of its conditions. +-Additional permissions that are applicable to the entire Program shall +-be treated as though they were included in this License, to the extent +-that they are valid under applicable law. If additional permissions +-apply only to part of the Program, that part may be used separately +-under those permissions, but the entire Program remains governed by +-this License without regard to the additional permissions. +- +- When you convey a copy of a covered work, you may at your option +-remove any additional permissions from that copy, or from any part of +-it. (Additional permissions may be written to require their own +-removal in certain cases when you modify the work.) You may place +-additional permissions on material, added by you to a covered work, +-for which you have or can give appropriate copyright permission. +- +- Notwithstanding any other provision of this License, for material you +-add to a covered work, you may (if authorized by the copyright holders of +-that material) supplement the terms of this License with terms: +- +- a) Disclaiming warranty or limiting liability differently from the +- terms of sections 15 and 16 of this License; or +- +- b) Requiring preservation of specified reasonable legal notices or +- author attributions in that material or in the Appropriate Legal +- Notices displayed by works containing it; or +- +- c) Prohibiting misrepresentation of the origin of that material, or +- requiring that modified versions of such material be marked in +- reasonable ways as different from the original version; or +- +- d) Limiting the use for publicity purposes of names of licensors or +- authors of the material; or +- +- e) Declining to grant rights under trademark law for use of some +- trade names, trademarks, or service marks; or +- +- f) Requiring indemnification of licensors and authors of that +- material by anyone who conveys the material (or modified versions of +- it) with contractual assumptions of liability to the recipient, for +- any liability that these contractual assumptions directly impose on +- those licensors and authors. +- +- All other non-permissive additional terms are considered "further +-restrictions" within the meaning of section 10. If the Program as you +-received it, or any part of it, contains a notice stating that it is +-governed by this License along with a term that is a further +-restriction, you may remove that term. If a license document contains +-a further restriction but permits relicensing or conveying under this +-License, you may add to a covered work material governed by the terms +-of that license document, provided that the further restriction does +-not survive such relicensing or conveying. +- +- If you add terms to a covered work in accord with this section, you +-must place, in the relevant source files, a statement of the +-additional terms that apply to those files, or a notice indicating +-where to find the applicable terms. +- +- Additional terms, permissive or non-permissive, may be stated in the +-form of a separately written license, or stated as exceptions; +-the above requirements apply either way. +- +- 8. Termination. +- +- You may not propagate or modify a covered work except as expressly +-provided under this License. Any attempt otherwise to propagate or +-modify it is void, and will automatically terminate your rights under +-this License (including any patent licenses granted under the third +-paragraph of section 11). +- +- However, if you cease all violation of this License, then your +-license from a particular copyright holder is reinstated (a) +-provisionally, unless and until the copyright holder explicitly and +-finally terminates your license, and (b) permanently, if the copyright +-holder fails to notify you of the violation by some reasonable means +-prior to 60 days after the cessation. +- +- Moreover, your license from a particular copyright holder is +-reinstated permanently if the copyright holder notifies you of the +-violation by some reasonable means, this is the first time you have +-received notice of violation of this License (for any work) from that +-copyright holder, and you cure the violation prior to 30 days after +-your receipt of the notice. +- +- Termination of your rights under this section does not terminate the +-licenses of parties who have received copies or rights from you under +-this License. If your rights have been terminated and not permanently +-reinstated, you do not qualify to receive new licenses for the same +-material under section 10. +- +- 9. Acceptance Not Required for Having Copies. +- +- You are not required to accept this License in order to receive or +-run a copy of the Program. Ancillary propagation of a covered work +-occurring solely as a consequence of using peer-to-peer transmission +-to receive a copy likewise does not require acceptance. However, +-nothing other than this License grants you permission to propagate or +-modify any covered work. These actions infringe copyright if you do +-not accept this License. Therefore, by modifying or propagating a +-covered work, you indicate your acceptance of this License to do so. +- +- 10. Automatic Licensing of Downstream Recipients. +- +- Each time you convey a covered work, the recipient automatically +-receives a license from the original licensors, to run, modify and +-propagate that work, subject to this License. You are not responsible +-for enforcing compliance by third parties with this License. +- +- An "entity transaction" is a transaction transferring control of an +-organization, or substantially all assets of one, or subdividing an +-organization, or merging organizations. If propagation of a covered +-work results from an entity transaction, each party to that +-transaction who receives a copy of the work also receives whatever +-licenses to the work the party's predecessor in interest had or could +-give under the previous paragraph, plus a right to possession of the +-Corresponding Source of the work from the predecessor in interest, if +-the predecessor has it or can get it with reasonable efforts. +- +- You may not impose any further restrictions on the exercise of the +-rights granted or affirmed under this License. For example, you may +-not impose a license fee, royalty, or other charge for exercise of +-rights granted under this License, and you may not initiate litigation +-(including a cross-claim or counterclaim in a lawsuit) alleging that +-any patent claim is infringed by making, using, selling, offering for +-sale, or importing the Program or any portion of it. +- +- 11. Patents. +- +- A "contributor" is a copyright holder who authorizes use under this +-License of the Program or a work on which the Program is based. The +-work thus licensed is called the contributor's "contributor version". +- +- A contributor's "essential patent claims" are all patent claims +-owned or controlled by the contributor, whether already acquired or +-hereafter acquired, that would be infringed by some manner, permitted +-by this License, of making, using, or selling its contributor version, +-but do not include claims that would be infringed only as a +-consequence of further modification of the contributor version. For +-purposes of this definition, "control" includes the right to grant +-patent sublicenses in a manner consistent with the requirements of ++ 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. + +- Each contributor grants you a non-exclusive, worldwide, royalty-free +-patent license under the contributor's essential patent claims, to +-make, use, sell, offer for sale, import and otherwise run, modify and +-propagate the contents of its contributor version. +- +- In the following three paragraphs, a "patent license" is any express +-agreement or commitment, however denominated, not to enforce a patent +-(such as an express permission to practice a patent or covenant not to +-sue for patent infringement). To "grant" such a patent license to a +-party means to make such an agreement or commitment not to enforce a +-patent against the party. +- +- If you convey a covered work, knowingly relying on a patent license, +-and the Corresponding Source of the work is not available for anyone +-to copy, free of charge and under the terms of this License, through a +-publicly available network server or other readily accessible means, +-then you must either (1) cause the Corresponding Source to be so +-available, or (2) arrange to deprive yourself of the benefit of the +-patent license for this particular work, or (3) arrange, in a manner +-consistent with the requirements of this License, to extend the patent +-license to downstream recipients. "Knowingly relying" means you have +-actual knowledge that, but for the patent license, your conveying the +-covered work in a country, or your recipient's use of the covered work +-in a country, would infringe one or more identifiable patents in that +-country that you have reason to believe are valid. +- +- If, pursuant to or in connection with a single transaction or +-arrangement, you convey, or propagate by procuring conveyance of, a +-covered work, and grant a patent license to some of the parties +-receiving the covered work authorizing them to use, propagate, modify +-or convey a specific copy of the covered work, then the patent license +-you grant is automatically extended to all recipients of the covered +-work and works based on it. +- +- A patent license is "discriminatory" if it does not include within +-the scope of its coverage, prohibits the exercise of, or is +-conditioned on the non-exercise of one or more of the rights that are +-specifically granted under this License. You may not convey a covered +-work if you are a party to an arrangement with a third party that is +-in the business of distributing software, under which you make payment +-to the third party based on the extent of your activity of conveying +-the work, and under which the third party grants, to any of the +-parties who would receive the covered work from you, a discriminatory +-patent license (a) in connection with copies of the covered work +-conveyed by you (or copies made from those copies), or (b) primarily +-for and in connection with specific products or compilations that +-contain the covered work, unless you entered into that arrangement, +-or that patent license was granted, prior to 28 March 2007. +- +- Nothing in this License shall be construed as excluding or limiting +-any implied license or other defenses to infringement that may +-otherwise be available to you under applicable patent law. +- +- 12. No Surrender of Others' Freedom. +- +- If conditions are imposed on you (whether by court order, agreement or ++ 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 convey a +-covered work so as to satisfy simultaneously your obligations under this +-License and any other pertinent obligations, then as a consequence you may +-not convey it at all. For example, if you agree to terms that obligate you +-to collect a royalty for further conveying from those to whom you convey +-the Program, the only way you could satisfy both those terms and this +-License would be to refrain entirely from conveying the Program. +- +- 13. Use with the GNU Affero General Public License. +- +- Notwithstanding any other provision of this License, you have +-permission to link or combine any covered work with a work licensed +-under version 3 of the GNU Affero General Public License into a single +-combined work, and to convey the resulting work. The terms of this +-License will continue to apply to the part which is the covered work, +-but the special requirements of the GNU Affero General Public License, +-section 13, concerning interaction through a network will apply to the +-combination as such. +- +- 14. Revised Versions of this License. ++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. + +- The Free Software Foundation may publish revised and/or new versions of +-the GNU General Public License from time to time. Such new versions will ++ 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 that a certain numbered version of the GNU General +-Public License "or any later version" applies to it, you have the +-option of following the terms and conditions either of that numbered +-version or of any later version published by the Free Software +-Foundation. If the Program does not specify a version number of the +-GNU General Public License, you may choose any version ever published +-by the Free Software Foundation. +- +- If the Program specifies that a proxy can decide which future +-versions of the GNU General Public License can be used, that proxy's +-public statement of acceptance of a version permanently authorizes you +-to choose that version for the Program. +- +- Later license versions may give you additional or different +-permissions. However, no additional obligations are imposed on any +-author or copyright holder as a result of your choosing to follow a +-later version. +- +- 15. Disclaimer of Warranty. +- +- 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. +- +- 16. Limitation of Liability. +- +- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +-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. +- +- 17. Interpretation of Sections 15 and 16. +- +- If the disclaimer of warranty and limitation of liability provided +-above cannot be given local legal effect according to their terms, +-reviewing courts shall apply local law that most closely approximates +-an absolute waiver of all civil liability in connection with the +-Program, unless a warranty or assumption of liability accompanies a +-copy of the Program in return for a fee. ++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 ++ END OF TERMS AND CONDITIONS + +- How to Apply These Terms to Your New Programs ++ 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 +@@ -629,15 +287,15 @@ + + 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 +-state the exclusion of warranty; and each file should have at least ++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 ++ 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 3 of the License, or ++ 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, +@@ -645,32 +303,37 @@ + 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, see <http://www.gnu.org/licenses/>. ++ 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 does terminal interaction, make it output a short +-notice like this when it starts in an interactive mode: ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: + +- <program> Copyright (C) <year> <name of author> +- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ 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, your program's commands +-might be different; for a GUI interface, you would use an "about box". +- +- You should also get your employer (if you work as a programmer) or school, +-if any, to sign a "copyright disclaimer" for the program, if necessary. +-For more information on this, and how to apply and follow the GNU GPL, see +-<http://www.gnu.org/licenses/>. +- +- The GNU 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. But first, please read +-<http://www.gnu.org/philosophy/why-not-lgpl.html>. +- ++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. +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/ffmpeg2theora.pmdoc/01ffmpeg-contents.xml ffmpeg2theora/ffmpeg2theora.pmdoc/01ffmpeg-contents.xml +--- ffmpeg2theora-0.28.orig/ffmpeg2theora.pmdoc/01ffmpeg-contents.xml 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg2theora/ffmpeg2theora.pmdoc/01ffmpeg-contents.xml 2012-05-27 02:20:15.237987204 +0200 +@@ -0,0 +1 @@ ++<pkg-contents spec="1.12"><f n="ffmpeg2theora" o="root" g="wheel" p="16877" pt="/tmp/ffmpeg2theora/" m="false" t="file"><f n="usr" o="root" g="wheel" p="16877"><f n="local" o="root" g="wheel" p="16877"><f n="bin" o="root" g="wheel" p="16877"><f n="ffmpeg2theora" o="root" g="wheel" p="33261"><mod>owner</mod></f><mod>owner</mod></f><mod>owner</mod></f><mod>owner</mod></f><mod>owner</mod></f></pkg-contents> +\ Kein Zeilenumbruch am Dateiende. +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/ffmpeg2theora.pmdoc/01ffmpeg.xml ffmpeg2theora/ffmpeg2theora.pmdoc/01ffmpeg.xml +--- ffmpeg2theora-0.28.orig/ffmpeg2theora.pmdoc/01ffmpeg.xml 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg2theora/ffmpeg2theora.pmdoc/01ffmpeg.xml 2012-05-27 02:20:15.237987204 +0200 +@@ -0,0 +1 @@ ++<pkgref spec="1.12" uuid="01291888-CCA4-41A5-AAB3-BC2E3CFE6477"><config><identifier>cc.v2v.ffmpeg2theora</identifier><version>0.28</version><description/><post-install type="none"/><requireAuthorization/><installFrom mod="true">/tmp/ffmpeg2theora/</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installTo.isRelativeType</mod><mod>installTo</mod><mod>installTo.isAbsoluteType</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod></config><contents><file-list>01ffmpeg-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass</filter></contents></pkgref> +\ Kein Zeilenumbruch am Dateiende. +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/ffmpeg2theora.pmdoc/index.xml ffmpeg2theora/ffmpeg2theora.pmdoc/index.xml +--- ffmpeg2theora-0.28.orig/ffmpeg2theora.pmdoc/index.xml 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg2theora/ffmpeg2theora.pmdoc/index.xml 2012-05-27 02:20:15.237987204 +0200 +@@ -0,0 +1 @@ ++<pkmkdoc spec="1.12"><properties><title>ffmpeg2theora</title><build>/Users/build/ffmpeg2theora-0.28.pkg</build><organization>org.xiph</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Commandline tool to encode video in Ogg Theora</description><contents><choice title="ffmpeg2theora" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="cc.v2v.ffmpeg2theora"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"/></resources><flags/><item type="file">01ffmpeg.xml</item></pkmkdoc> +Binärdateien ffmpeg2theora-0.28.orig/ffmpeg2theora.pmproj and ffmpeg2theora/ffmpeg2theora.pmproj sind verschieden. +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/get_ffmpeg.sh ffmpeg2theora/get_ffmpeg.sh +--- ffmpeg2theora-0.28.orig/get_ffmpeg.sh 2011-07-30 21:55:10.000000000 +0200 ++++ ffmpeg2theora/get_ffmpeg.sh 2012-05-27 02:20:15.249986882 +0200 +@@ -1,22 +1,5 @@ + #!/bin/sh +- +-common="--enable-version3 --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: +-#extra="$extra --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" ++cd `dirname $0` + + # load FFMPEG specific properties + . ./ffmpegrev +@@ -24,7 +7,8 @@ + test -e $FFMPEG_CO_DIR || git clone $FFMPEG_URL $FFMPEG_CO_DIR + cd $FFMPEG_CO_DIR + #git pull -r $FFMPEG_REVISION +-git checkout release/0.7 ++#git checkout release/0.7 ++git checkout master + git pull + cd .. + +@@ -37,7 +21,5 @@ + cd .. + } + +-#test -e $FFMPEG_CO_DIR/.ffmpeg2theora_patched || apply_patches +-#configure and build ffmpeg +-cd $FFMPEG_CO_DIR && ./configure $options && make ++./build_ffmpeg.sh + +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/SConstruct ffmpeg2theora/SConstruct +--- ffmpeg2theora-0.28.orig/SConstruct 2011-07-31 12:20:37.000000000 +0200 ++++ ffmpeg2theora/SConstruct 2012-05-27 03:11:47.363291108 +0200 +@@ -1,17 +1,17 @@ + # SCons build specification ++# vi:si:et:sw=2:sts=2:ts=2 + from glob import glob + import os + + import SCons + +-def svnversion(): ++def version(): + f = os.popen("./version.sh") + version = f.read().strip() + f.close() + return version + +-pkg_version="0.28" +-#pkg_version +="+svn" + svnversion() ++pkg_version=version() + + pkg_name="ffmpeg2theora" + +@@ -27,6 +27,7 @@ + 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'), +@@ -39,6 +40,8 @@ + env = Environment(options = opts) + Help(opts.GenerateHelpText(env)) + ++env.Append(LINKFLAGS="-lm") ++ + pkg_flags="--cflags --libs" + if env'static': + pkg_flags+=" --static" +@@ -71,8 +74,6 @@ + if GetOption("help"): + Return() + +-env.PrependENVPath ('PATH', os.environ'PATH') +- + 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) +@@ -103,101 +104,113 @@ + context.Result( ret ) + return ret + ++env.PrependENVPath ('PATH', os.environ'PATH') ++ + conf = Configure(env, custom_tests = { + 'CheckPKGConfig' : CheckPKGConfig, + 'CheckPKG' : CheckPKG, +- }) +- +-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", +- "libavcodec >= 52.30.0", +- "libpostproc", +- "libswscale", +- "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' +- ) +- +-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 env"build_ffmpeg": ++ if env.GetOption('clean'): ++ TryAction("cd ffmpeg;make distclean") ++ else: ++ TryAction("./build_ffmpeg.sh") + +-if conf.CheckCHeader('libavformat/framehook.h'): ++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= +- '-DHAVE_FRAMEHOOK' ++ '-Iffmpeg' + ) + +-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: ++ if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): + 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') ++ 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') + +-if env'crossmingw': +- env.Append(CCFLAGS='-Wl,-subsystem,windows') +- env.Append(LIBS='m') +-elif env'static': +- env.Append(LIBS='m', 'dl') + + env = conf.Finish() + +@@ -209,4 +222,3 @@ + ffmpeg2theora.Install(bin_dir, 'ffmpeg2theora') + ffmpeg2theora.Install(man_dir + "/man1", 'ffmpeg2theora.1') + ffmpeg2theora.Alias('install', prefix) +- +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/avinfo.c ffmpeg2theora/src/avinfo.c +--- ffmpeg2theora-0.28.orig/src/avinfo.c 2011-05-06 14:43:23.000000000 +0200 ++++ ffmpeg2theora/src/avinfo.c 2012-05-27 02:20:14.987993914 +0200 +@@ -1,13 +1,13 @@ + /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ + /* + * avinfo.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis +- * Copyright (C) 2003-2009 <j@v2v.cc> ++ * Copyright (C) 2003-2011 <j@v2v.cc> + * + * gcc -o avinfo avinfo.c -DAVINFO `pkg-config --cflags --libs libavcodec libavformat` + * + * 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 3 of the License, or ++ * 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, +@@ -42,6 +42,7 @@ + #include <sys/stat.h> + + #include "libavformat/avformat.h" ++#include "libavutil/pixdesc.h" + + #ifndef WIN32 + #if !defined(off64_t) +@@ -200,7 +201,7 @@ + codec_name = fix_codec_name(codec_name); + json_add_key_value(output, "codec", (void *)codec_name, JSON_STRING, 0, indent); + if (enc->pix_fmt != PIX_FMT_NONE) { +- json_add_key_value(output, "pixel_format", (void *)avcodec_get_pix_fmt_name(enc->pix_fmt), JSON_STRING, 0, indent); ++ json_add_key_value(output, "pixel_format", (void *)av_get_pix_fmt_name(enc->pix_fmt), JSON_STRING, 0, indent); + } + if (enc->width) { + json_add_key_value(output, "width", &enc->width, JSON_INT, 0, indent); +@@ -385,12 +386,11 @@ + error: + return i == n; + } +- +-void json_metadata(FILE *output, const AVFormatContext *av) ++int _json_metadata(FILE *output, AVDictionary *m, int first, int indent) + { +- int first = 1, indent=2; +- AVMetadataTag *tag = NULL; +- while ((tag = av_metadata_get(av->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { ++ int i = 0; ++ AVDictionaryEntry *tag = NULL; ++ while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) { + if (strlen(tag->value) && utf8_validate (tag->value, strlen(tag->value))) { + if (first) { + first = 0; +@@ -404,6 +404,17 @@ + json_add_key_value(output, tag->key, tag->value, JSON_STRING, 1, indent); + } + } ++ return first; ++} ++ ++void json_metadata(FILE *output, const AVFormatContext *av) ++{ ++ int first = 1, indent=2, i=0; ++ first = _json_metadata(output, av->metadata, first, indent); ++ ++ for(i=0;i<av->nb_streams;i++) { ++ first = _json_metadata(output, av->streamsi->metadata, first, indent); ++ } + if (!first) { + do_indent(output, 1); + fprintf(output, "},\n"); +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/ffmpeg2theora.c ffmpeg2theora/src/ffmpeg2theora.c +--- ffmpeg2theora-0.28.orig/src/ffmpeg2theora.c 2011-07-30 22:04:25.000000000 +0200 ++++ ffmpeg2theora/src/ffmpeg2theora.c 2012-05-27 02:20:14.989993860 +0200 +@@ -1,11 +1,11 @@ + /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ + /* + * ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis +- * Copyright (C) 2003-2009 <j@v2v.cc> ++ * Copyright (C) 2003-2011 <j@v2v.cc> + * + * 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 3 of the License, or ++ * 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, +@@ -504,7 +504,7 @@ + + static const char *find_language_for_subtitle_stream(const AVStream *s) + { +- AVMetadataTag *language = av_metadata_get(s->metadata, "language", NULL, 0); ++ AVDictionaryEntry *language = av_dict_get(s->metadata, "language", NULL, 0); + const char *lang=find_iso639_1(language->value); + if (!lang) { + fprintf(stderr, "WARNING - unrecognized ISO 639-2 language code: %s\n", +@@ -517,13 +517,13 @@ + unsigned int i; + AVCodecContext *aenc = NULL; + AVCodecContext *venc = NULL; +- int venc_pix_fmt; ++ int venc_pix_fmt = 0; + AVStream *astream = NULL; + AVStream *vstream = NULL; + AVCodec *acodec = NULL; + AVCodec *vcodec = NULL; +- pp_mode_t *ppMode = NULL; +- pp_context_t *ppContext = NULL; ++ pp_mode *ppMode = NULL; ++ pp_context *ppContext = NULL; + int sws_flags = this->resize_method; + float frame_aspect = 0; + double fps = 0.0; +@@ -575,6 +575,7 @@ + vstream = this->context->streamsthis->video_index; + venc = vstream->codec; + vcodec = avcodec_find_decoder (venc->codec_id); ++ + display_width = venc->width; + display_height = venc->height; + venc_pix_fmt = venc->pix_fmt; +@@ -594,7 +595,7 @@ + } + this->fps = fps = av_q2d(vstream_fps); + +- if (vcodec == NULL || avcodec_open (venc, vcodec) < 0) { ++ if (vcodec == NULL || avcodec_open2 (venc, vcodec, NULL) < 0) { + this->video_index = -1; + } + this->fps = fps; +@@ -954,14 +955,14 @@ + this->channels = aenc->channels; + } + +- if (acodec != NULL && avcodec_open (aenc, acodec) >= 0) { ++ if (acodec != NULL && avcodec_open2 (aenc, acodec, NULL) >= 0) { + if (this->sample_rate != sample_rate + || this->channels != aenc->channels +- || aenc->sample_fmt != SAMPLE_FMT_S16) { ++ || aenc->sample_fmt != AV_SAMPLE_FMT_S16) { + // values take from libavcodec/resample.c + this->audio_resample_ctx = av_audio_resample_init(this->channels, aenc->channels, + this->sample_rate, sample_rate, +- SAMPLE_FMT_S16, aenc->sample_fmt, ++ AV_SAMPLE_FMT_S16, aenc->sample_fmt, + 16, 10, 0, 0.8); + if (!this->audio_resample_ctx) { + this->channels = aenc->channels; +@@ -991,7 +992,7 @@ + const char *category; + if (enc->codec_type == AVMEDIA_TYPE_SUBTITLE) { + AVCodec *codec = avcodec_find_decoder (enc->codec_id); +- if (codec && avcodec_open (enc, codec) >= 0) { ++ if (codec && avcodec_open2 (enc, codec, NULL) >= 0) { + subtitles_openedi = 1; + } + category = find_category_for_subtitle_stream(this, i, this->included_subtitles); +@@ -1530,7 +1531,7 @@ + int samples=0; + int samples_out=0; + int data_size = 4*AVCODEC_MAX_AUDIO_FRAME_SIZE; +- int bytes_per_sample = av_get_bits_per_sample_fmt(aenc->sample_fmt)/8; ++ int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt); + + if (avpkt.size > 0) { + len1 = avcodec_decode_audio3(astream->codec, audio_buf, &data_size, &avpkt); +@@ -1785,6 +1786,7 @@ + /* clear out state */ + if (info.passno != 1) + free_subtitles(this); ++ this->context = NULL; + if (info.twopass != 3) { + av_free(this); + } +@@ -1922,8 +1924,8 @@ + + "AUTHOR" + }; +- AVMetadataTag *tag = NULL; +- while ((tag = av_metadata_get(av->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { ++ AVDictionaryEntry *tag = NULL; ++ while ((tag = av_dict_get(av->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + char uc_key16; + int i; + for (i = 0; tag->keyi != '\0' && i < LENGTH(uc_key) - 1; i++) +@@ -1984,9 +1986,21 @@ + th_encode_free(td); + + fprintf(stdout, +- PACKAGE " " PACKAGE_VERSION " - %s\n", th_version_string()); ++ PACKAGE " " PACKAGE_VERSION "\n\n" ++ "\t%s\n" ++ "\t%s\n", ++ th_version_string(), ++ vorbis_version_string()); ++ ++ unsigned int version = avcodec_version(); ++ fprintf(stdout, "\tFFmpeg\t libavcodec %02d.%d.%d\n", ++ version >> 16, version >> 8 & 0xff, version & 0xff); ++ version = avformat_version(); ++ fprintf(stdout, "\tFFmpeg\t libavformat %02d.%d.%d\n", ++ version >> 16, version >> 8 & 0xff, version & 0xff); ++ + fprintf(stdout, +- "\n" ++ "\n\n" + " Usage: " PACKAGE " options input\n" + "\n" + "General output options:\n" +@@ -2180,7 +2194,7 @@ + static int metadata_flag = -1; + + AVInputFormat *input_fmt = NULL; +- AVFormatParameters params, *formatParams = NULL; ++ AVDictionary *format_opts = NULL; + + int c,long_option_index; + const char *optstring = "P:o:k:f:F:x:y:v:V:a:A:K:d:H:c:G:Z:C:B:p:N:s:e:D:h::"; +@@ -2811,29 +2825,25 @@ + for(info.passno=(info.twopass==3?1:info.twopass);info.passno<=(info.twopass==3?2:info.twopass);info.passno++){ + //detect image sequences and set framerate if provided + if (input_fmt != NULL && strcmp(input_fmt->name, "video4linux") >= 0) { +- formatParams = ¶ms; +- memset(formatParams, 0, sizeof(*formatParams)); +- if (input_fmt != NULL && strcmp(input_fmt->name, "video4linux") >= 0) { +- formatParams->channel = 0; +- formatParams->width = PAL_HALF_WIDTH; +- formatParams->height = PAL_HALF_HEIGHT; +- formatParams->time_base.den = 25; +- formatParams->time_base.num = 2; +- if (convert->picture_width) +- formatParams->width = convert->picture_width; +- if (convert->picture_height) +- formatParams->height = convert->picture_height; ++ char buf100; ++ av_dict_set(&format_opts, "channel", "0", 0); ++ if (convert->picture_width || convert->picture_height) { ++ snprintf(buf, sizeof(buf), "%dx%d", ++ convert->picture_width, convert->picture_height); ++ av_dict_set(&format_opts,"video_size", buf, 0); + } + if (convert->force_input_fps.num > 0) { +- formatParams->time_base.den = convert->force_input_fps.num; +- formatParams->time_base.num = convert->force_input_fps.den; ++ snprintf(buf, sizeof(buf), "%d/%d", ++ convert->force_input_fps.den, convert->force_input_fps.num); ++ av_dict_set(&format_opts, "framerate", buf, 0); + } else if (convert->framerate_new.num > 0) { +- formatParams->time_base.den = convert->framerate_new.num; +- formatParams->time_base.num = convert->framerate_new.den; ++ snprintf(buf, sizeof(buf), "%d/%d", ++ convert->framerate_new.den, convert->framerate_new.num); ++ av_dict_set(&format_opts, "framerate", buf, 0); + } + } +- if (av_open_input_file(&convert->context, inputfile_name, input_fmt, 0, formatParams) >= 0) { +- if (av_find_stream_info(convert->context) >= 0) { ++ if (avformat_open_input(&convert->context, inputfile_name, input_fmt, &format_opts) >= 0) { ++ if (avformat_find_stream_info(convert->context, NULL) >= 0) { + + if (output_filename_needs_building) { + int i; +@@ -2863,7 +2873,7 @@ + /* reserve 4 bytes in the buffer for the `.ogva' extension */ + snprintf(outputfile_name, sizeof(outputfile_name) - strlen(ext), "%s",inputfile_name); + if ((str_ptr = strrchr(outputfile_name, '.'))) { +- sprintf(str_ptr, ext); ++ sprintf(str_ptr, "%s", ext); + if (!strcmp(inputfile_name, outputfile_name)) { + snprintf(outputfile_name, sizeof(outputfile_name), "%s%s", inputfile_name, ext); + } +@@ -2960,7 +2970,7 @@ + fprintf(stderr,"\nUnable to decode input.\n"); + return(1); + } +- av_close_input_file(convert->context); ++ avformat_close_input(&convert->context); + } + else{ + if (info.frontend) +@@ -2992,5 +3002,6 @@ + if (info.twopass==3) + unlink(_tmp_2pass); + #endif ++ av_dict_free(&format_opts); + return(0); + } +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/index.c ffmpeg2theora/src/index.c +--- ffmpeg2theora-0.28.orig/src/index.c 2010-01-28 06:55:38.000000000 +0100 ++++ ffmpeg2theora/src/index.c 2012-05-27 02:20:14.988993887 +0200 +@@ -7,7 +7,7 @@ + * + * 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 3 of the License, or ++ * 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, +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/index.h ffmpeg2theora/src/index.h +--- ffmpeg2theora-0.28.orig/src/index.h 2010-01-28 06:55:38.000000000 +0100 ++++ ffmpeg2theora/src/index.h 2012-05-27 02:20:14.989993860 +0200 +@@ -7,7 +7,7 @@ + * + * 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 3 of the License, or ++ * 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, +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/subtitles.c ffmpeg2theora/src/subtitles.c +--- ffmpeg2theora-0.28.orig/src/subtitles.c 2010-10-20 15:49:04.000000000 +0200 ++++ ffmpeg2theora/src/subtitles.c 2012-05-27 02:20:14.987993914 +0200 +@@ -1,11 +1,11 @@ + /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ + /* + * subtitles.c -- Kate Subtitles +- * Copyright (C) 2003-2009 <j@v2v.cc> ++ * Copyright (C) 2003-2011 <j@v2v.cc> + * + * 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 3 of the License, or ++ * 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, +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/theorautils.c ffmpeg2theora/src/theorautils.c +--- ffmpeg2theora-0.28.orig/src/theorautils.c 2011-02-16 21:39:25.000000000 +0100 ++++ ffmpeg2theora/src/theorautils.c 2012-05-27 02:20:14.987993914 +0200 +@@ -1,11 +1,11 @@ + /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ + /* + * theorautils.c - Ogg Theora/Ogg Vorbis Abstraction and Muxing +- * Copyright (C) 2003-2009 <j@v2v.cc> ++ * Copyright (C) 2003-2011 <j@v2v.cc> + * + * 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 3 of the License, or ++ * 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, +@@ -533,8 +533,12 @@ + int index_bytes = 0; + int keypoints_cutoff = 0; + +- /* Must have indexed keypoints. */ +- assert(index->max_keypoints > 0 && index->packet_num > 0); ++ /* Must have indexed keypoints to go on */ ++ if (index->max_keypoints == 0 || index->packet_num == 0) { ++ fprintf(stderr, "WARNING: no key points for %s stream %08x\n", name, serialno); ++ return 0; ++ } ++ + /* Must have placeholder packet to rewrite. */ + assert(index->page_location > 0); + +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/src/theorautils.h ffmpeg2theora/src/theorautils.h +--- ffmpeg2theora-0.28.orig/src/theorautils.h 2011-01-10 06:04:13.000000000 +0100 ++++ ffmpeg2theora/src/theorautils.h 2012-05-27 02:20:14.988993887 +0200 +@@ -5,7 +5,7 @@ + * + * 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 3 of the License, or ++ * 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, +diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/version.sh ffmpeg2theora/version.sh +--- ffmpeg2theora-0.28.orig/version.sh 2011-01-18 15:04:48.000000000 +0100 ++++ ffmpeg2theora/version.sh 2012-05-27 02:20:15.248986909 +0200 +@@ -1,2 +1,11 @@ ++#!/bin/bash + cd `dirname $0` +-svnversion ++version='0.28' ++test -e .svn && svnversion=`which svnversion` ++echo -n $version ++if "x$svnversion" != "x" ; then ++ echo -n "+svn" ++ svnversion ++else ++ echo ++fi
View file
lp_509_508_jw.diff
Deleted
@@ -1,88 +0,0 @@ ---- ffmpeg2theora-0.28/src/ffmpeg2theora.c.orig 2011-07-30 22:04:25.000000000 +0200 -+++ ffmpeg2theora-0.28/src/ffmpeg2theora.c 2012-03-15 18:17:04.419200000 +0100 -@@ -520,12 +520,12 @@ void ff2theora_output(ff2theora this) { - int venc_pix_fmt; - AVStream *astream = NULL; - AVStream *vstream = NULL; - AVCodec *acodec = NULL; - AVCodec *vcodec = NULL; -- pp_mode_t *ppMode = NULL; -- pp_context_t *ppContext = NULL; -+ pp_mode *ppMode = NULL; -+ pp_context *ppContext = NULL; - int sws_flags = this->resize_method; - float frame_aspect = 0; - double fps = 0.0; - AVRational vstream_fps; - int display_width = -1, display_height = -1; -@@ -955,15 +955,15 @@ void ff2theora_output(ff2theora this) { - } - - if (acodec != NULL && avcodec_open (aenc, acodec) >= 0) { - if (this->sample_rate != sample_rate - || this->channels != aenc->channels -- || aenc->sample_fmt != SAMPLE_FMT_S16) { -+ || aenc->sample_fmt != AV_SAMPLE_FMT_S16) { - // values take from libavcodec/resample.c - this->audio_resample_ctx = av_audio_resample_init(this->channels, aenc->channels, - this->sample_rate, sample_rate, -- SAMPLE_FMT_S16, aenc->sample_fmt, -+ AV_SAMPLE_FMT_S16, aenc->sample_fmt, - 16, 10, 0, 0.8); - if (!this->audio_resample_ctx) { - this->channels = aenc->channels; - } - if (!info.frontend && this->sample_rate!=sample_rate) -@@ -2831,11 +2831,11 @@ int main(int argc, char **argv) { - formatParams->time_base.den = convert->framerate_new.num; - formatParams->time_base.num = convert->framerate_new.den; - } - } - if (av_open_input_file(&convert->context, inputfile_name, input_fmt, 0, formatParams) >= 0) { -- if (av_find_stream_info(convert->context) >= 0) { -+ if (avformat_find_stream_info(convert->context, NULL) >= 0) { - - if (output_filename_needs_building) { - int i; - /* work out the stream types the output will hold */ - int has_video = 0, has_audio = 0, has_kate = 0, has_skeleton = 0; -@@ -2958,11 +2958,11 @@ int main(int argc, char **argv) { - json_format_info(stdout, NULL, inputfile_name); - else - fprintf(stderr,"\nUnable to decode input.\n"); - return(1); - } -- av_close_input_file(convert->context); -+ avformat_close_input(&convert->context); - } - else{ - if (info.frontend) - json_format_info(info.frontend, NULL, inputfile_name); - else if (output_json) ---- ffmpeg2theora-0.28/SConstruct.orig 2011-07-31 12:20:37.000000000 +0200 -+++ ffmpeg2theora-0.28/SConstruct 2012-03-15 18:43:13.703216000 +0100 -@@ -140,10 +140,11 @@ FFMPEG_LIBS= - "libavdevice", - "libavformat", - "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', '')) -@@ -196,10 +197,12 @@ if conf.CheckCHeader('iconv.h'): - if env'crossmingw': - env.Append(CCFLAGS='-Wl,-subsystem,windows') - env.Append(LIBS='m') - elif env'static': - env.Append(LIBS='m', 'dl') -+else: -+ env.Append(LIBS='m') - - env = conf.Finish() - - # ffmpeg2theora - ffmpeg2theora = env.Clone()
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.