COPYING

-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1991, 1999 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
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            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 Library 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.
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 and use pieces of
+it in new free programs; and that you are informed that 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.
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
 
   The precise terms and conditions for copying, distribution and
-modification follow.
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
 
-		    GNU GENERAL PUBLIC LICENSE
+                  GNU LESSER 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
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+
+  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
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+  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 Library or any portion
+of it, thus forming a work based on the Library, 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
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified 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.)
-
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
 These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
+identifiable sections of that work are not derived from the Library,
 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
+on the Library, 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.
+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.
+collective works based on the Library.
 
-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
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) 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
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
 
-  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
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be 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.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+  9. 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
+distribute the Library 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
+modifying or distributing the Library (or any work based on the
+Library), 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.
+the Library 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
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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
+You are not responsible for enforcing compliance by third parties with
 this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
+
+  11. 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
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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.
+refrain entirely from distribution of the Library.
 
-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.
+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
+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
@@ -225,116 +401,102 @@ 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
+
+  12. If the distribution and/or use of the Library 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
+original copyright holder who places the Library 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.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
 
-	    How to Apply These Terms to Your New Programs
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
 
-  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.
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
 
-  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.
+  To apply these terms, attach the following notices to the library.  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) 19yy  <name of author>
+    <one line to give the library'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 library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    This library 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
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
 
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; 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) 19yy 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
+school, if any, to sign a "copyright disclaimer" for the library, 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.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
+  <signature of Ty Coon>, 1 April 1990
   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 Library General
-Public License instead of this License.
+That's all there is to it!

ChangeLog

+=== release 1.18.0 ===
+
+2020-09-08 00:07:45 +0100  Tim-Philipp Müller <tim@centricular.com>
+
+	* ChangeLog:
+	* NEWS:
+	* README:
+	* RELEASE:
+	* gst-plugins-bad.doap:
+	* meson.build:
+	  Release 1.18.0
+
+2020-09-07 22:48:27 +0100  Tim-Philipp Müller <tim@centricular.com>
+
+	* meson.build:
+	* scripts/dist-translations.py:
+	* scripts/meson.build:
+	  meson: dist pot file in tarball
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1558>
+
+2020-09-07 12:14:47 +0300  Sebastian Dröge <sebastian@centricular.com>
+
+	* ext/x265/gstx265enc.c:
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth265parse.c:
+	* sys/nvcodec/gstnvdec.c:
+	* sys/nvcodec/gstnvh264enc.c:
+	* sys/nvcodec/gstnvh265enc.c:
+	  gst: Update for gst_video_transfer_function_*() function renaming
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1557>
+
+2020-09-01 15:05:07 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+
+	* tests/check/elements/mpegtsmux.c:
+	  tests: mpegtsmux: Test that we can manipulate pads after stop
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1552>
+
+2020-09-01 14:56:55 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+
+	* gst/mpegtsmux/gstbasetsmux.c:
+	  mpegtsmux: Keep mux usable after stop
+	  Otherwise you cannot request new pads until after it is started again.
+	  gst_base_ts_mux_reset with FALSE is still called in the dispose
+	  implementation, so the muxer still gets deallocated when we actually
+	  clean up.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1552>
+
+2020-09-01 13:32:44 +0800  Haihao Xiang <haihao.xiang@intel.com>
+
+	* sys/msdk/gstmsdkvp9dec.c:
+	  msdkvp9dec: change the include header order
+	  This fixes the compiler error when MFX_VERSION_USE_LATEST is defined in
+	  the SDK.
+	  /usr/include/mfx/mfxvp9.h:48:5: error: unknown type name ‘mfxExtBuffer’
+	  mfxExtBuffer Header;
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1549>
+
+2020-08-29 02:42:12 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* gst/rtmp2/gstrtmp2locationhandler.c:
+	  rtmp2: Need to unescape the userinfo before setting
+	  This regressed in 827afa206d8c9675f2a7af402396552c2ed1df09. The same
+	  fix was also committed to the webrtc element, but rtmp2 was missed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1547>
+
+2020-08-29 02:40:44 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* ext/webrtc/gstwebrtcice.c:
+	  webrtc: Clean up the userinfo unescaping code
+	  Continuation from 04fd705906f4bd4cf1901001484e60c21e1b3139. This is
+	  easier to understand and also avoids two copies.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1547>
+
+2020-08-25 10:04:53 +0200  Jérôme Laheurte <jerome@jeromelaheurte.net>
+
+	* sys/dshowsrcwrapper/BUILD.txt:
+	* sys/dshowsrcwrapper/CMakeLists.txt:
+	  dshowsrcwrapper: Update build instructions. Add _builddir to include search path.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1537>
+
+2020-08-28 07:53:26 +1000  Jonathan Matthew <jonathan@d14n.org>
+
+	* ext/modplug/gstmodplug.cc:
+	  modplug: avoid division by zero
+	  Under some conditions, GetMaxPosition() returns zero, which should cause
+	  position queries to fail rather than crash.
+
+2020-08-21 18:40:59 -0400  trilene <trilene@runbox.com>
+
+	* ext/webrtc/gstwebrtcice.c:
+	  webrtc: Unescape turnserver user and password
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1530>
+
+2020-08-22 23:33:48 +0200  Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+	* gst-libs/gst/opencv/meson.build:
+	  meson: allow the user to disable opencv
+	  Allow the user to really disable opencv through meson (i.e.
+	  -Dopencv=disabled).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1533>
+
+2020-08-25 23:46:16 +0100  Tim-Philipp Müller <tim@centricular.com>
+
+	* ext/sctp/usrsctp/usrsctplib/netinet/sctp_constants.h:
+	  sctp: usrsctp: increase DIAG_MSG_LEN to accomodate longer file path
+	  Fixes "‘%s’ directive output truncated writing XX bytes into
+	  a region of size NN [-Wformat-truncation=]" compiler warnings.
+	  https://github.com/sctplab/usrsctp/pull/521
+	  Fixes #1389
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1540>
+
+2020-08-25 10:49:11 +0200  Jérôme Laheurte <jerome@jeromelaheurte.net>
+
+	* sys/dshowsrcwrapper/gstdshow.cpp:
+	  dshowsrcwrapper: fix typo in variable name
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1538>
+
+2020-08-21 16:28:42 +0200  Wim Taymans <wtaymans@redhat.com>
+
+	* gst-libs/gst/vulkan/meson.build:
+	  vulkan: fix the enumtypes install path
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1528>
+
+2020-08-22 14:38:38 +0100  Philippe Normand <philn@igalia.com>
+
+	* ext/wpe/gstwpesrc.cpp:
+	  wpe: skip glbasesrc decide_allocation when non-GL caps are negotiated
+	  Checking for GL caps features in gl_start() was done too late in case the parent
+	  class fails to setup a working GL context. The element now determines if GL
+	  support should be enabled during the decide-allocation query handling.
+	  Additionally, when no GL context was found, we need to handle the element
+	  cleanup because in that situation glbasesrc won't call gl_stop.
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1376
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1532>
+
+2020-08-21 22:48:48 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  codecs: h264decoder: Fix possible GstH264Picture leak and small cleanup
+	  Don't leak pictures when dpb is full unexpectedly.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1527>
+
+2020-08-21 02:36:13 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11videosink.c:
+	  d3d11videosink: Fix crash caused by missing null termination
+	  gst_caps_features_new() must be null terminated.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1524>
+
+2020-08-19 16:50:46 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvaallocator.c:
+	  va: allocator: remove parameter from _create_buffer_surface()
+	  Don't the allocator to _create_buffer_surface() since it's not used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1516>
+
+2020-08-19 17:18:26 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvautils.c:
+	  va: utils: free allocated string
+	  and fix a memleak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1516>
+
+2020-08-18 09:05:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvautils.c:
+	  va: utils: fix log category initialization
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1516>
+
+2020-08-18 11:39:46 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvah264dec.c:
+	* sys/va/gstvah264dec.h:
+	  va: h264dec: check va allocator at decide allocation
+	  And some code cleanups
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1516>
+
+2020-08-18 11:38:46 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvadecoder.c:
+	  va: decoder: improve locks for member variable access
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1516>
+
+2020-08-24 17:01:59 +1000  Matthew Waters <matthew@centricular.com>
+
+	* ext/webrtc/webrtcdatachannel.c:
+	  webrtc/datachannel: clear the error after use
+	  Fixes a memory leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1535>
+
+2020-08-24 17:01:22 +1000  Matthew Waters <matthew@centricular.com>
+
+	* ext/webrtc/webrtcdatachannel.c:
+	* gst-libs/gst/webrtc/datachannel.c:
+	  webrtc/datachannel: free previous protocol/label fields
+	  Fixes a memory leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1535>
+
+2020-08-24 17:00:30 +1000  Matthew Waters <matthew@centricular.com>
+
+	* tests/check/elements/webrtcbin.c:
+	  tests/webrtc: unref GBytes after use
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1535>
+
+2020-08-24 16:58:41 +1000  Matthew Waters <matthew@centricular.com>
+
+	* ext/sctp/gstsctpdec.c:
+	  sctpdec: unref after retrieving the static pad template
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1535>
+
 === release 1.17.90 ===
 2020-08-20 16:14:23 +0100  Tim-Philipp Müller <tim@centricular.com>

README

-GStreamer 1.17.x development series
+GStreamer 1.18.x stable series
 
 WHAT IT IS
 ----------

RELEASE

-This is GStreamer gst-plugins-bad 1.17.90.
+This is GStreamer gst-plugins-bad 1.18.0.
 
-GStreamer 1.17 is the development branch leading up to the next major
-stable version which will be 1.18.
+The GStreamer team is thrilled to announce a new major feature release
+of your favourite cross-platform multimedia framework!
 
-The 1.17 development series adds new features on top of the 1.16 series and is
+As always, this release is again packed with new features, bug fixes and
+other improvements.
+
+The 1.18 release series adds new features on top of the 1.16 series and is
 part of the API and ABI-stable 1.x release series of the GStreamer multimedia
 framework.
 
-Full release notes will one day be found at:
+Full release notes can be found at:
 
   https://gstreamer.freedesktop.org/releases/1.18/
 

docs/meson.build

@@ -233,6 +233,7 @@ foreach plugin_name: list_plugin_res.stdout().split(':')
             join_paths(root_rel, 'ext/*/*.cc'),
             join_paths(root_rel, 'ext/*/*.hh'),
             join_paths(root_rel, 'gst/*/*.[ch]'),
+            join_paths(root_rel, 'gst/rtmp2/*/*.[ch]'),
         ],
         dependencies: [gst_dep, plugins],
         install: false,

ext/avtp/gstavtpaafdepay.c

@@ -147,7 +147,7 @@ avtp_to_gst_rate (int rate)
 
 static gboolean
 gst_avtp_aaf_depay_push_caps_event (GstAvtpAafDepay * avtpaafdepay,
-    guint64 rate, guint64 depth, guint64 format, guint64 channels)
+    gint rate, gint depth, gint format, gint channels)
 {
   GstCaps *caps;
   GstEvent *event;

ext/avtp/gstavtpcvfdepay.c

@@ -365,7 +365,7 @@ gst_avtp_cvf_depay_validate_avtpdu (GstAvtpCvfDepay * avtpcvfdepay,
   g_assert (r == 0);
   if (G_UNLIKELY (map->size < sizeof (*pdu) + val)) {
     GST_DEBUG_OBJECT (avtpcvfdepay,
-        "AVTP packet size %ld too small, expected at least %lu",
+        "AVTP packet size %ld too small, expected at least %" G_GUINT64_FORMAT,
         map->size - AVTP_CVF_H264_HEADER_SIZE, sizeof (*pdu) + val);
     goto end;
   }
@@ -375,8 +375,8 @@ gst_avtp_cvf_depay_validate_avtpdu (GstAvtpCvfDepay * avtpcvfdepay,
   g_assert (r == 0);
   if (G_UNLIKELY (val != avtpcvfdepay->seqnum)) {
     GST_INFO_OBJECT (avtpcvfdepay,
-        "Unexpected AVTP header seq num %lu, expected %u", val,
-        avtpcvfdepay->seqnum);
+        "Unexpected AVTP header seq num %" G_GUINT64_FORMAT ", expected %u",
+        val, avtpcvfdepay->seqnum);
 
     avtpcvfdepay->seqnum = val;
     /* This is not a reason to drop the packet, but it may be a good moment
@@ -447,8 +447,8 @@ gst_avtp_cvf_depay_internal_push (GstAvtpCvfDepay * avtpcvfdepay,
   GstFlowReturn ret = GST_FLOW_OK;
 
   GST_LOG_OBJECT (avtpcvfdepay,
-      "Adding buffer of size %lu (nalu size %lu) to out_buffer",
-      gst_buffer_get_size (buffer),
+      "Adding buffer of size %" G_GUINT64_FORMAT " (nalu size %"
+      G_GUINT64_FORMAT ") to out_buffer", gst_buffer_get_size (buffer),
       gst_buffer_get_size (buffer) - sizeof (guint32));
 
   if (avtpcvfdepay->out_buffer) {
@@ -568,8 +568,8 @@ gst_avtp_cvf_depay_handle_fu_a (GstAvtpCvfDepay * avtpcvfdepay,
 
   if (G_UNLIKELY (map->size - AVTP_CVF_H264_HEADER_SIZE < 2)) {
     GST_ERROR_OBJECT (avtpcvfdepay,
-        "Buffer too small to contain fragment headers, size: %lu",
-        map->size - AVTP_CVF_H264_HEADER_SIZE);
+        "Buffer too small to contain fragment headers, size: %"
+        G_GUINT64_FORMAT, map->size - AVTP_CVF_H264_HEADER_SIZE);
     ret = gst_avtp_cvf_depay_push_and_discard (avtpcvfdepay);
     goto end;
   }

ext/avtp/gstavtpcvfpay.c

@@ -347,7 +347,8 @@ gst_avtpcvpay_fragment_nal (GstAvtpCvfPay * avtpcvfpay, GstBuffer * nal,
   if (*offset == 0 && (nal_size + AVTP_CVF_H264_HEADER_SIZE) <= avtpcvfpay->mtu) {
     *last_fragment = TRUE;
     *offset = nal_size;
-    GST_DEBUG_OBJECT (avtpcvfpay, "Generated fragment with size %lu", nal_size);
+    GST_DEBUG_OBJECT (avtpcvfpay,
+        "Generated fragment with size %" G_GUINT64_FORMAT, nal_size);
     return gst_buffer_ref (nal);
   }
 
@@ -402,8 +403,8 @@ gst_avtpcvpay_fragment_nal (GstAvtpCvfPay * avtpcvfpay, GstBuffer * nal,
 
   *offset += fragment_size;
 
-  GST_DEBUG_OBJECT (avtpcvfpay, "Generated fragment with size %lu",
-      fragment_size);
+  GST_DEBUG_OBJECT (avtpcvfpay,
+      "Generated fragment with size %" G_GUINT64_FORMAT, fragment_size);
 
   return fragment;
 }
@@ -533,7 +534,7 @@ gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpCvfPay * avtpcvfpay,
 
     nal = g_ptr_array_index (nals, i);
     GST_LOG_OBJECT (avtpcvfpay,
-        "Preparing AVTP packets for NAL whose size is %lu",
+        "Preparing AVTP packets for NAL whose size is %" G_GUINT64_FORMAT,
         gst_buffer_get_size (nal));
 
     /* Calculate timestamps. Note that we do it twice, one using DTS as base,
@@ -602,10 +603,10 @@ gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpCvfPay * avtpcvfpay,
         if (M) {
           GST_LOG_OBJECT (avtpcvfpay, "M packet sent, PTS: %" GST_TIME_FORMAT
               " DTS: %" GST_TIME_FORMAT " AVTP_TS: %" GST_TIME_FORMAT
-              " H264_TS: %" GST_TIME_FORMAT "\navtp_time: %lu h264_time: %lu",
-              GST_TIME_ARGS (h264_time),
-              GST_TIME_ARGS (avtp_time), GST_TIME_ARGS ((guint32) avtp_time),
-              GST_TIME_ARGS ((guint32) h264_time), avtp_time, h264_time);
+              " H264_TS: %" GST_TIME_FORMAT "\navtp_time: %" G_GUINT64_FORMAT
+              " h264_time: %" G_GUINT64_FORMAT, GST_TIME_ARGS (h264_time),
+              GST_TIME_ARGS (avtp_time), GST_TIME_ARGS (avtp_time & 0xffffffff),
+              GST_TIME_ARGS (h264_time & 0xffffffff), avtp_time, h264_time);
         }
       }
 
@@ -662,8 +663,8 @@ gst_avtp_cvf_pay_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
   GstFlowReturn ret = GST_FLOW_OK;
 
   GST_LOG_OBJECT (avtpcvfpay,
-      "Incoming buffer size: %lu PTS: %" GST_TIME_FORMAT " DTS: %"
-      GST_TIME_FORMAT, gst_buffer_get_size (buffer),
+      "Incoming buffer size: %" G_GUINT64_FORMAT " PTS: %" GST_TIME_FORMAT
+      " DTS: %" GST_TIME_FORMAT, gst_buffer_get_size (buffer),
       GST_TIME_ARGS (GST_BUFFER_PTS (buffer)),
       GST_TIME_ARGS (GST_BUFFER_DTS (buffer)));
 

ext/avtp/gstavtpsrc.c

@@ -275,8 +275,9 @@ gst_avtp_src_fill (GstPushSrc * pushsrc, GstBuffer * buffer)
   buffer_size = gst_buffer_get_size (buffer);
   if (G_UNLIKELY (buffer_size < MAX_AVTPDU_SIZE)) {
     GST_WARNING_OBJECT (avtpsrc,
-        "Buffer size (%lu) may not be enough to hold AVTPDU (max AVTPDU size %d)",
-        buffer_size, MAX_AVTPDU_SIZE);
+        "Buffer size (%" G_GUINT64_FORMAT
+        ") may not be enough to hold AVTPDU (max AVTPDU size %d)", buffer_size,
+        MAX_AVTPDU_SIZE);
     n = buffer_size;
   }
 

ext/closedcaption/gstline21enc.c

@@ -29,6 +29,7 @@
 #endif
 
 #include <gst/gst.h>
+#include <gst/base/base.h>
 #include <gst/video/video.h>
 #include <string.h>
 
@@ -38,7 +39,14 @@
 GST_DEBUG_CATEGORY_STATIC (gst_line_21_encoder_debug);
 #define GST_CAT_DEFAULT gst_line_21_encoder_debug
 
-#define CAPS "video/x-raw, format={ I420, YUY2, YVYU, UYVY, VYUY }, width=(int)720, height=(int)[ 23, MAX ], interlace-mode=interleaved"
+enum
+{
+  PROP_0,
+  PROP_REMOVE_CAPTION_META,
+};
+
+/* FIXME: add and test support for PAL resolutions */
+#define CAPS "video/x-raw, format={ I420, YUY2, YVYU, UYVY, VYUY }, width=(int)720, height=(int){ 525, 486 }, interlace-mode=interleaved"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -58,16 +66,41 @@ static gboolean gst_line_21_encoder_set_info (GstVideoFilter * filter,
     GstCaps * outcaps, GstVideoInfo * out_info);
 static GstFlowReturn gst_line_21_encoder_transform_ip (GstVideoFilter * filter,
     GstVideoFrame * frame);
+static void gst_line_21_encoder_set_property (GObject * self, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_line_21_encoder_get_property (GObject * self, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
 
 static void
 gst_line_21_encoder_class_init (GstLine21EncoderClass * klass)
 {
+  GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
   GstVideoFilterClass *filter_class;
 
+  gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
   filter_class = (GstVideoFilterClass *) klass;
 
+  gobject_class->set_property = gst_line_21_encoder_set_property;
+  gobject_class->get_property = gst_line_21_encoder_get_property;
+
+  /**
+   * line21encoder:remove-caption-meta
+   *
+   * Selects whether the encoded #GstVideoCaptionMeta should be removed from
+   * the outgoing video buffers or whether it should be kept.
+   *
+   * Since: 1.20
+   */
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_REMOVE_CAPTION_META, g_param_spec_boolean ("remove-caption-meta",
+          "Remove Caption Meta",
+          "Remove encoded caption meta from outgoing video buffers", FALSE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+
   gst_element_class_set_static_metadata (gstelement_class,
       "Line 21 CC Encoder",
       "Filter/Video/ClosedCaption",
@@ -90,6 +123,38 @@ gst_line_21_encoder_init (GstLine21Encoder * filter)
 {
 }
 
+static void
+gst_line_21_encoder_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstLine21Encoder *enc = GST_LINE21ENCODER (object);
+
+  switch (prop_id) {
+    case PROP_REMOVE_CAPTION_META:
+      enc->remove_caption_meta = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_line_21_encoder_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstLine21Encoder *enc = GST_LINE21ENCODER (object);
+
+  switch (prop_id) {
+    case PROP_REMOVE_CAPTION_META:
+      g_value_set_boolean (value, enc->remove_caption_meta);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
 static vbi_pixfmt
 vbi_pixfmt_from_gst_video_format (GstVideoFormat format)
 {
@@ -147,6 +212,218 @@ gst_line_21_encoder_set_info (GstVideoFilter * filter,
   return TRUE;
 }
 
+#define MAX_CDP_PACKET_LEN 256
+#define MAX_CEA608_LEN 32
+
+/* Converts CDP into raw CEA708 cc_data, taken from ccconverter */
+static guint
+convert_cea708_cdp_cea708_cc_data_internal (GstLine21Encoder * self,
+    const guint8 * cdp, guint cdp_len, guint8 cc_data[256])
+{
+  GstByteReader br;
+  guint16 u16;
+  guint8 u8;
+  guint8 flags;
+  guint len = 0;
+
+  /* Header + footer length */
+  if (cdp_len < 11) {
+    GST_WARNING_OBJECT (self, "cdp packet too short (%u). expected at "
+        "least %u", cdp_len, 11);
+    return 0;
+  }
+
+  gst_byte_reader_init (&br, cdp, cdp_len);
+  u16 = gst_byte_reader_get_uint16_be_unchecked (&br);
+  if (u16 != 0x9669) {
+    GST_WARNING_OBJECT (self, "cdp packet does not have initial magic bytes "
+        "of 0x9669");
+    return 0;
+  }
+
+  u8 = gst_byte_reader_get_uint8_unchecked (&br);
+  if (u8 != cdp_len) {
+    GST_WARNING_OBJECT (self, "cdp packet length (%u) does not match passed "
+        "in value (%u)", u8, cdp_len);
+    return 0;
+  }
+
+  gst_byte_reader_skip_unchecked (&br, 1);
+
+  flags = gst_byte_reader_get_uint8_unchecked (&br);
+  /* No cc_data? */
+  if ((flags & 0x40) == 0) {
+    GST_DEBUG_OBJECT (self, "cdp packet does have any cc_data");
+    return 0;
+  }
+
+  /* cdp_hdr_sequence_cntr */
+  gst_byte_reader_skip_unchecked (&br, 2);
+
+  /* time_code_present */
+  if (flags & 0x80) {
+    if (gst_byte_reader_get_remaining (&br) < 5) {
+      GST_WARNING_OBJECT (self, "cdp packet does not have enough data to "
+          "contain a timecode (%u). Need at least 5 bytes",
+          gst_byte_reader_get_remaining (&br));
+      return 0;
+    }
+
+    gst_byte_reader_skip_unchecked (&br, 5);
+  }
+
+  /* ccdata_present */
+  if (flags & 0x40) {
+    guint8 cc_count;
+
+    if (gst_byte_reader_get_remaining (&br) < 2) {
+      GST_WARNING_OBJECT (self, "not enough data to contain valid cc_data");
+      return 0;
+    }
+    u8 = gst_byte_reader_get_uint8_unchecked (&br);
+    if (u8 != 0x72) {
+      GST_WARNING_OBJECT (self, "missing cc_data start code of 0x72, "
+          "found 0x%02x", u8);
+      return 0;
+    }
+
+    cc_count = gst_byte_reader_get_uint8_unchecked (&br);
+    if ((cc_count & 0xe0) != 0xe0) {
+      GST_WARNING_OBJECT (self, "reserved bits are not 0xe0, found 0x%02x", u8);
+      return 0;
+    }
+    cc_count &= 0x1f;
+
+    len = 3 * cc_count;
+    if (gst_byte_reader_get_remaining (&br) < len)
+      return 0;
+
+    memcpy (cc_data, gst_byte_reader_get_data_unchecked (&br, len), len);
+  }
+
+  /* skip everything else we don't care about */
+  return len;
+}
+
+#define VAL_OR_0(v) ((v) ? (*(v)) : 0)
+
+static guint
+compact_cc_data (guint8 * cc_data, guint cc_data_len)
+{
+  gboolean started_ccp = FALSE;
+  guint out_len = 0;
+  guint i;
+
+  if (cc_data_len % 3 != 0) {
+    GST_WARNING ("Invalid cc_data buffer size");
+    cc_data_len = cc_data_len - (cc_data_len % 3);
+  }
+
+  for (i = 0; i < cc_data_len / 3; i++) {
+    gboolean cc_valid = (cc_data[i * 3] & 0x04) == 0x04;
+    guint8 cc_type = cc_data[i * 3] & 0x03;
+
+    if (!started_ccp && (cc_type == 0x00 || cc_type == 0x01)) {
+      if (cc_valid) {
+        /* copy over valid 608 data */
+        cc_data[out_len++] = cc_data[i * 3];
+        cc_data[out_len++] = cc_data[i * 3 + 1];
+        cc_data[out_len++] = cc_data[i * 3 + 2];
+      }
+      continue;
+    }
+
+    if (cc_type & 0x10)
+      started_ccp = TRUE;
+
+    if (!cc_valid)
+      continue;
+
+    if (cc_type == 0x00 || cc_type == 0x01) {
+      GST_WARNING ("Invalid cc_data.  cea608 bytes after cea708");
+      return 0;
+    }
+
+    cc_data[out_len++] = cc_data[i * 3];
+    cc_data[out_len++] = cc_data[i * 3 + 1];
+    cc_data[out_len++] = cc_data[i * 3 + 2];
+  }
+
+  GST_LOG ("compacted cc_data from %u to %u", cc_data_len, out_len);
+
+  return out_len;
+}
+
+static gint
+cc_data_extract_cea608 (guint8 * cc_data, guint cc_data_len,
+    guint8 * cea608_field1, guint * cea608_field1_len,
+    guint8 * cea608_field2, guint * cea608_field2_len)
+{
+  guint i, field_1_len = 0, field_2_len = 0;
+
+  if (cea608_field1_len) {
+    field_1_len = *cea608_field1_len;
+    *cea608_field1_len = 0;
+  }
+  if (cea608_field2_len) {
+    field_2_len = *cea608_field2_len;
+    *cea608_field2_len = 0;
+  }
+
+  if (cc_data_len % 3 != 0) {
+    GST_WARNING ("Invalid cc_data buffer size %u. Truncating to a multiple "
+        "of 3", cc_data_len);
+    cc_data_len = cc_data_len - (cc_data_len % 3);
+  }
+
+  for (i = 0; i < cc_data_len / 3; i++) {
+    gboolean cc_valid = (cc_data[i * 3] & 0x04) == 0x04;
+    guint8 cc_type = cc_data[i * 3] & 0x03;
+
+    GST_TRACE ("0x%02x 0x%02x 0x%02x, valid: %u, type: 0b%u%u",
+        cc_data[i * 3 + 0], cc_data[i * 3 + 1], cc_data[i * 3 + 2], cc_valid,
+        cc_type & 0x2, cc_type & 0x1);
+
+    if (cc_type == 0x00) {
+      if (!cc_valid)
+        continue;
+
+      if (cea608_field1 && cea608_field1_len) {
+        if (*cea608_field1_len + 2 > field_1_len) {
+          GST_WARNING ("Too many cea608 input bytes %u for field 1",
+              *cea608_field1_len + 2);
+          return -1;
+        }
+        cea608_field1[(*cea608_field1_len)++] = cc_data[i * 3 + 1];
+        cea608_field1[(*cea608_field1_len)++] = cc_data[i * 3 + 2];
+      }
+    } else if (cc_type == 0x01) {
+      if (!cc_valid)
+        continue;
+
+      if (cea608_field2 && cea608_field2_len) {
+        if (*cea608_field2_len + 2 > field_2_len) {
+          GST_WARNING ("Too many cea608 input bytes %u for field 2",
+              *cea608_field2_len + 2);
+          return -1;
+        }
+        cea608_field2[(*cea608_field2_len)++] = cc_data[i * 3 + 1];
+        cea608_field2[(*cea608_field2_len)++] = cc_data[i * 3 + 2];
+      }
+    } else {
+      /* all cea608 packets must be at the beginning of a cc_data */
+      break;
+    }
+  }
+
+  g_assert_cmpint (i * 3, <=, cc_data_len);
+
+  GST_LOG ("Extracted cea608-1 of length %u and cea608-2 of length %u",
+      VAL_OR_0 (cea608_field1_len), VAL_OR_0 (cea608_field2_len));
+
+  return i * 3;
+}
+
 static GstFlowReturn
 gst_line_21_encoder_transform_ip (GstVideoFilter * filter,
     GstVideoFrame * frame)
@@ -157,6 +434,7 @@ gst_line_21_encoder_transform_ip (GstVideoFilter * filter,
   vbi_sliced sliced[2];
   gpointer iter = NULL;
   GstFlowReturn ret = GST_FLOW_ERROR;
+  guint offset;
 
   sliced[0].id = VBI_SLICED_CAPTION_525_F1;
   sliced[0].line = self->sp.start[0];
@@ -175,41 +453,73 @@ gst_line_21_encoder_transform_ip (GstVideoFilter * filter,
     guint n = cc_meta->size;
     guint i;
 
-    if (cc_meta->caption_type != GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A)
-      continue;
+    if (cc_meta->caption_type == GST_VIDEO_CAPTION_TYPE_CEA708_CDP) {
+      guint8 cc_data[MAX_CDP_PACKET_LEN];
+      guint8 cea608_field1[MAX_CEA608_LEN];
+      guint8 cea608_field2[MAX_CEA608_LEN];
+      guint cea608_field1_len = MAX_CEA608_LEN;
+      guint cea608_field2_len = MAX_CEA608_LEN;
+      guint cc_data_len = 0;
 
-    if (n % 3 != 0) {
-      GST_ERROR_OBJECT (filter, "Invalid S334-1A CEA608 buffer size");
-      goto done;
-    }
+      cc_data_len =
+          convert_cea708_cdp_cea708_cc_data_internal (self, cc_meta->data,
+          cc_meta->size, cc_data);
 
-    n /= 3;
+      cc_data_len = compact_cc_data (cc_data, cc_data_len);
 
-    if (n >= 3) {
-      GST_ERROR_OBJECT (filter, "Too many S334-1A CEA608 triplets %u", n);
-      goto done;
-    }
+      cc_data_extract_cea608 (cc_data, cc_data_len,
+          cea608_field1, &cea608_field1_len, cea608_field2, &cea608_field2_len);
 
-    for (i = 0; i < n; i++) {
-      if (cc_meta->data[i * 3] & 0x80) {
-        sliced[0].data[0] = cc_meta->data[i * 3 + 1];
-        sliced[0].data[1] = cc_meta->data[i * 3 + 2];
-      } else {
-        sliced[1].data[0] = cc_meta->data[i * 3 + 1];
-        sliced[1].data[1] = cc_meta->data[i * 3 + 2];
+      if (cea608_field1_len == 2) {
+        sliced[0].data[0] = cea608_field1[0];
+        sliced[0].data[1] = cea608_field1[1];
       }
-    }
 
-    break;
+      if (cea608_field2_len == 2) {
+        sliced[1].data[0] = cea608_field2[0];
+        sliced[1].data[1] = cea608_field2[1];
+      }
+
+      break;
+    } else if (cc_meta->caption_type == GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A) {
+      if (n % 3 != 0) {
+        GST_ERROR_OBJECT (filter, "Invalid S334-1A CEA608 buffer size");
+        goto done;
+      }
+
+      n /= 3;
+
+      if (n >= 3) {
+        GST_ERROR_OBJECT (filter, "Too many S334-1A CEA608 triplets %u", n);
+        goto done;
+      }
+
+      for (i = 0; i < n; i++) {
+        if (cc_meta->data[i * 3] & 0x80) {
+          sliced[0].data[0] = cc_meta->data[i * 3 + 1];
+          sliced[0].data[1] = cc_meta->data[i * 3 + 2];
+        } else {
+          sliced[1].data[0] = cc_meta->data[i * 3 + 1];
+          sliced[1].data[1] = cc_meta->data[i * 3 + 2];
+        }
+      }
+
+      break;
+    }
   }
 
-  /* We've encoded this meta, it can now be removed */
-  if (cc_meta)
+  /* We've encoded this meta, it can now be removed if required */
+  if (cc_meta && self->remove_caption_meta)
     gst_buffer_remove_meta (frame->buffer, (GstMeta *) cc_meta);
 
+  /* When dealing with standard NTSC resolution, field 1 goes at line 21,
+   * when dealing with a reduced height the image has 3 VBI lines at the
+   * top and 3 at the bottom, and field 1 goes at line 1 */
+  offset = self->info.height == 525 ? 21 : 1;
+
   buf =
       (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (frame,
-      0) + 21 * GST_VIDEO_INFO_COMP_STRIDE (&self->info, 0);
+      0) + offset * GST_VIDEO_INFO_COMP_STRIDE (&self->info, 0);
 
   if (!vbi_raw_video_image (buf, GST_VIDEO_INFO_COMP_STRIDE (&self->info,
               0) * 2, &self->sp, 0, 0, 0, 0x000000FF, 0, sliced, 2)) {

ext/closedcaption/gstline21enc.h

@@ -48,6 +48,8 @@ struct _GstLine21Encoder
   vbi_sampling_par sp;
 
   GstVideoInfo info;
+
+  gboolean remove_caption_meta;
 };
 
 struct _GstLine21EncoderClass

ext/curl/gstcurlbasesink.c

@@ -121,6 +121,8 @@ static size_t gst_curl_base_sink_transfer_read_cb (void *ptr, size_t size,
     size_t nmemb, void *stream);
 static size_t gst_curl_base_sink_transfer_write_cb (void *ptr, size_t size,
     size_t nmemb, void *stream);
+static int gst_curl_base_sink_transfer_seek_cb (void *user_p, curl_off_t offset,
+    int origin);
 static size_t gst_curl_base_sink_transfer_data_buffer (GstCurlBaseSink * sink,
     void *curl_ptr, size_t block_size, guint * last_chunk);
 #ifndef GST_DISABLE_GST_DEBUG
@@ -705,6 +707,21 @@ gst_curl_base_sink_transfer_set_common_options_unlocked (GstCurlBaseSink * sink)
         curl_easy_strerror (res));
     return FALSE;
   }
+
+  res = curl_easy_setopt (sink->curl, CURLOPT_SEEKDATA, sink);
+  if (res != CURLE_OK) {
+    sink->error = g_strdup_printf ("failed to set seek user data: %s",
+        curl_easy_strerror (res));
+    return FALSE;
+  }
+  res = curl_easy_setopt (sink->curl, CURLOPT_SEEKFUNCTION,
+      gst_curl_base_sink_transfer_seek_cb);
+  if (res != CURLE_OK) {
+    sink->error = g_strdup_printf ("failed to set seek function: %s",
+        curl_easy_strerror (res));
+    return FALSE;
+  }
+
   /* Time out in case transfer speed in bytes per second stay below
    * CURLOPT_LOW_SPEED_LIMIT during CURLOPT_LOW_SPEED_TIME */
   res = curl_easy_setopt (sink->curl, CURLOPT_LOW_SPEED_LIMIT, 1L);
@@ -883,6 +900,45 @@ gst_curl_base_sink_transfer_write_cb (void G_GNUC_UNUSED * ptr, size_t size,
   return realsize;
 }
 
+static int
+gst_curl_base_sink_transfer_seek_cb (void *stream, curl_off_t offset,
+    int origin)
+{
+  GstCurlBaseSink *sink;
+  curl_off_t buf_size;
+
+  /*
+   *  Origin is SEEK_SET, SEEK_CUR or SEEK_END,
+   *  libcurl currently only passes SEEK_SET.
+   */
+
+  sink = (GstCurlBaseSink *) stream;
+
+  GST_OBJECT_LOCK (sink);
+  buf_size = sink->transfer_buf->offset + sink->transfer_buf->len;
+
+  switch (origin) {
+    case SEEK_SET:
+      if ((0 <= offset) && (offset <= buf_size)) {
+        sink->transfer_buf->offset = offset;
+        sink->transfer_buf->len = buf_size - offset;
+      } else {
+        GST_OBJECT_UNLOCK (sink);
+        return CURL_SEEKFUNC_FAIL;
+      }
+      break;
+    case SEEK_CUR:
+    case SEEK_END:
+    default:
+      GST_OBJECT_UNLOCK (sink);
+      return CURL_SEEKFUNC_FAIL;
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (sink);
+  return CURL_SEEKFUNC_OK;
+}
+
 CURLcode
 gst_curl_base_sink_transfer_check (GstCurlBaseSink * sink)
 {

ext/dash/gstxmlhelper.c

@@ -460,32 +460,6 @@ gst_xml_helper_get_prop_unsigned_integer (xmlNode * a_node,
   return exists;
 }
 
-/* g_ascii_string_to_unsigned is available since 2.54. Get rid of this wrapper
- * when we bump the version in 1.18 */
-#if !GLIB_CHECK_VERSION(2,54,0)
-#define g_ascii_string_to_unsigned gst_xml_helper_ascii_string_to_unsigned
-static gboolean
-gst_xml_helper_ascii_string_to_unsigned (const gchar * str, guint base,
-    guint64 min, guint64 max, guint64 * out_num, GError ** error)
-{
-  guint64 number;
-  gchar *endptr = NULL;
-
-  number = g_ascii_strtoull (str, &endptr, base);
-
-  /* Be as strict as the implementation of g_ascii_string_to_unsigned in glib */
-  if (errno)
-    return FALSE;
-  if (g_ascii_isspace (str[0]) || str[0] == '-' || str[0] == '+')
-    return FALSE;
-  if (*endptr != '\0' || endptr == NULL)
-    return FALSE;
-
-  *out_num = number;
-  return TRUE;
-}
-#endif
-
 gboolean
 gst_xml_helper_get_prop_unsigned_integer_64 (xmlNode * a_node,
     const gchar * property_name, guint64 default_val, guint64 * property_value)

ext/dtls/gstdtlsconnection.c

@@ -619,9 +619,8 @@ gst_dtls_connection_process (GstDtlsConnection * self, gpointer data, gsize len,
   g_mutex_lock (&priv->mutex);
   GST_TRACE_OBJECT (self, "locked @ process");
 
-  g_warn_if_fail (!priv->bio_buffer);
-
-  if (self->priv->received_close_notify) {
+  if (self->priv->received_close_notify
+      || self->priv->connection_state == GST_DTLS_CONNECTION_STATE_CLOSED) {
     GST_DEBUG_OBJECT (self, "Already received close_notify");
     g_mutex_unlock (&priv->mutex);
     return GST_FLOW_EOS;
@@ -637,6 +636,8 @@ gst_dtls_connection_process (GstDtlsConnection * self, gpointer data, gsize len,
     return GST_FLOW_ERROR;
   }
 
+  g_warn_if_fail (!priv->bio_buffer);
+
   priv->bio_buffer = data;
   priv->bio_buffer_len = len;
   priv->bio_buffer_offset = 0;
@@ -1001,35 +1002,13 @@ handle_error (GstDtlsConnection * self, int ret, GstResourceError error_type,
     case SSL_ERROR_WANT_WRITE:
       GST_LOG_OBJECT (self, "SSL wants write");
       return GST_FLOW_OK;
-    case SSL_ERROR_SYSCALL:{
-      gchar message[1024] = "<unknown>";
-      gint syserror;
-#ifdef G_OS_WIN32
-      syserror = WSAGetLastError ();
-      FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, syserror, 0, message,
-          sizeof message, NULL);
-#else
-      syserror = errno;
-      strerror_r (syserror, message, sizeof message);
-#endif
-
-      if (syserror == 0) {
-        GST_TRACE_OBJECT (self, "No error");
-        return GST_FLOW_OK;
-      } else {
-        GST_ERROR_OBJECT (self, "Fatal SSL syscall error: errno %d: %s",
-            syserror, message);
-        if (err)
-          *err =
-              g_error_new (GST_RESOURCE_ERROR, error_type,
-              "Fatal SSL syscall error: errno %d: %s", syserror, message);
-        if (self->priv->connection_state != GST_DTLS_CONNECTION_STATE_FAILED) {
-          self->priv->connection_state = GST_DTLS_CONNECTION_STATE_FAILED;
-          *notify_state = TRUE;
-        }
-        return GST_FLOW_ERROR;
-      }
-    }
+    case SSL_ERROR_SYSCALL:
+      /* OpenSSL shouldn't be making real system calls, so we can safely
+       * ignore syscall errors. System interactions should happen through
+       * our BIO.
+       */
+      GST_DEBUG_OBJECT (self, "OpenSSL reported a syscall error, ignoring.");
+      return GST_FLOW_OK;
     default:
       if (self->priv->connection_state != GST_DTLS_CONNECTION_STATE_FAILED) {
         self->priv->connection_state = GST_DTLS_CONNECTION_STATE_FAILED;

ext/hls/gsthlssink2.c

@@ -19,14 +19,24 @@
  */
 
 /**
- * SECTION:element-hlssink
- * @title: hlssink
+ * SECTION:element-hlssink2
+ * @title: hlssink2
  *
- * HTTP Live Streaming sink/server
+ * HTTP Live Streaming sink/server. Unlike the old hlssink which took a muxed
+ * MPEG-TS stream as input, this element takes elementary audio and video
+ * streams as input and handles the muxing internally. This allows hlssink2
+ * to make better decisions as to when to start a new fragment and also works
+ * better with input streams where there isn't an encoder element upstream
+ * that can generate keyframes on demand as needed.
+ *
+ * This element only writes fragments and a playlist file into a specified
+ * directory, it does not contain an actual HTTP server to serve these files.
+ * Just point an external webserver to the directory with the playlist and
+ * fragment files.
  *
  * ## Example launch line
  * |[
- * gst-launch-1.0 videotestsrc is-live=true ! x264enc ! hlssink max-files=5
+ * gst-launch-1.0 videotestsrc is-live=true ! x264enc ! h264parse ! hlssink2 max-files=5
  * ]|
  *
  */
@@ -536,9 +546,9 @@ gst_hls_sink2_release_pad (GstElement * element, GstPad * pad)
 
   g_return_if_fail (pad == sink->audio_sink || pad == sink->video_sink);
 
-  peer = gst_pad_get_peer (pad);
+  peer = gst_ghost_pad_get_target (GST_GHOST_PAD (pad));
   if (peer) {
-    gst_element_release_request_pad (sink->splitmuxsink, pad);
+    gst_element_release_request_pad (sink->splitmuxsink, peer);
     gst_object_unref (peer);
   }
 

ext/isac/gstisac.c

+/* iSAC plugin
+ *
+ * Copyright (C) 2020 Collabora Ltd.
+ *  Author: Guillaume Desmottes <guillaume.desmottes@collabora.com>, Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * plugin-isac:
+ *
+ * Since: 1.20
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include <gst/gst.h>
+
+#include "gstisacenc.h"
+#include "gstisacdec.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  if (!gst_element_register (plugin, "isacenc", GST_RANK_PRIMARY,
+          GST_TYPE_ISACENC))
+    return FALSE;
+  if (!gst_element_register (plugin, "isacdec", GST_RANK_PRIMARY,
+          GST_TYPE_ISACDEC))
+    return FALSE;
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    isac,
+    "iSAC plugin", plugin_init, VERSION, "LGPL", PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)