Skip to content

Commit 28ed695

Browse files
akien-mgaakien-mga
committed
Merge pull request #107190 from akien-mga/libtheora-1.2.0
libtheora: Update to 1.2.0
2 parents 847042e + ff429e0 commit 28ed695

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+253
-264
lines changed

‎thirdparty/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ Files extracted from upstream source:
574574
## libtheora
575575

576576
- Upstream: https://www.theora.org
577-
- Version: git (7180717276af1ebc7da15c83162d6c5d6203aabf, 2020)
577+
- Version: 1.2.0 (8e4808736e9c181b971306cc3f05df9e61354004, 2025)
578578
- License: BSD-3-Clause
579579

580580
Files extracted from upstream source:

‎thirdparty/libtheora/analyze.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
8-
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009 *
9-
* by the Xiph.Org Foundation http://www.xiph.org/ *
8+
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009,2025 *
9+
* by the Xiph.Org Foundation https://www.xiph.org/ *
1010
* *
1111
********************************************************************
1212
1313
function: mode selection code
14-
last mod: $Id$
1514
1615
********************************************************************/
1716
#include <limits.h>
@@ -2168,14 +2167,14 @@ static void oc_cost_inter(oc_enc_ctx *_enc,oc_mode_choice *_modec,
21682167

21692168
static void oc_cost_inter_nomv(oc_enc_ctx *_enc,oc_mode_choice *_modec,
21702169
unsigned _mbi,int _mb_mode,const oc_fr_state *_fr,const oc_qii_state *_qs,
2171-
const unsigned _skip_ssd[12],const unsigned _rd_scale[4]){
2170+
const unsigned _skip_ssd[12],const unsigned _rd_scale[5]){
21722171
oc_cost_inter(_enc,_modec,_mbi,_mb_mode,0,_fr,_qs,_skip_ssd,_rd_scale);
21732172
}
21742173

21752174
static int oc_cost_inter1mv(oc_enc_ctx *_enc,oc_mode_choice *_modec,
21762175
unsigned _mbi,int _mb_mode,oc_mv _mv,
21772176
const oc_fr_state *_fr,const oc_qii_state *_qs,const unsigned _skip_ssd[12],
2178-
const unsigned _rd_scale[4]){
2177+
const unsigned _rd_scale[5]){
21792178
int bits0;
21802179
oc_cost_inter(_enc,_modec,_mbi,_mb_mode,_mv,_fr,_qs,_skip_ssd,_rd_scale);
21812180
bits0=OC_MV_BITS[0][OC_MV_X(_mv)+31]+OC_MV_BITS[0][OC_MV_Y(_mv)+31];
@@ -2645,7 +2644,7 @@ int oc_enc_analyze_inter(oc_enc_ctx *_enc,int _allow_keyframe,int _recode){
26452644
fragi=mb_maps[mbi][pli][bi];
26462645
/*If we switched from 4MV mode to INTER_MV mode, then the qii
26472646
values won't have been chosen with the right MV, but it's
2648-
probaby not worth re-estimating them.*/
2647+
probably not worth re-estimating them.*/
26492648
frags[fragi].qii=modes[mb_mode].qii[mapii];
26502649
frags[fragi].refi=refi;
26512650
frags[fragi].mb_mode=mb_mode;

‎thirdparty/libtheora/apiwrapper.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009 *
9-
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function:
14-
last mod: $Id$
1515
1616
********************************************************************/
1717

‎thirdparty/libtheora/apiwrapper.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009 *
9-
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function:
14-
last mod: $Id: apiwrapper.h 13596 2007-08-23 20:05:38Z tterribe $
1515
1616
********************************************************************/
1717

‎thirdparty/libtheora/bitpack.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE OggTheora SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
9-
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function: packing variable sized words into an octet stream
14-
last mod: $Id$
1515
1616
********************************************************************/
1717
#include <string.h>

‎thirdparty/libtheora/bitpack.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE OggTheora SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
9-
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function: packing variable sized words into an octet stream
14-
last mod: $Id: bitwise.c 7675 2004-09-01 00:34:39Z xiphmont $
1515
1616
********************************************************************/
1717
#if !defined(_bitpack_H)

‎thirdparty/libtheora/collect.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2011 *
9-
* by the Xiph.Org Foundation http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function: mode selection code
14-
last mod: $Id$
1515
1616
********************************************************************/
1717
#include <stdio.h>

‎thirdparty/libtheora/collect.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009 *
9-
* by the Xiph.Org Foundation http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation https://www.xiph.org/ *
1010
* *
1111
********************************************************************
1212
1313
function: mode selection code
14-
last mod: $Id$
1514
1615
********************************************************************/
1716
#if !defined(_collect_H)

‎thirdparty/libtheora/dct.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009 *
9-
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function:
14-
last mod: $Id$
1515
1616
********************************************************************/
1717

‎thirdparty/libtheora/decapiwrapper.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
77
* *
88
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009 *
9-
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
9+
* by the Xiph.Org Foundation and contributors *
10+
* https://www.xiph.org/ *
1011
* *
1112
********************************************************************
1213
1314
function:
14-
last mod: $Id: decapiwrapper.c 13596 2007-08-23 20:05:38Z tterribe $
1515
1616
********************************************************************/
1717

0 commit comments

Comments
 (0)