From: Good Guy Date: Sun, 21 Dec 2025 20:19:36 +0000 (-0700) Subject: Update libtheora from 1.1.1 to 1.2.0 with patch from Andrew X-Git-Url: https://git.cinelerra-gg.org/?a=commitdiff_plain;h=17fa80d7d099013c4ae4c8fb4ba5e5f359bfad31;p=goodguy%2Fcinelerra.git Update libtheora from 1.1.1 to 1.2.0 with patch from Andrew --- diff --git a/cinelerra-5.1/cinelerra/fileogg.C b/cinelerra-5.1/cinelerra/fileogg.C index bac03b1e..66d22a4e 100644 --- a/cinelerra-5.1/cinelerra/fileogg.C +++ b/cinelerra-5.1/cinelerra/fileogg.C @@ -558,11 +558,21 @@ int FileOGG::ogg_init_encode(FILE *out) int FileOGG::decode_theora_init() { + +int pp_level, pp_level_max; + dec = th_decode_alloc(&ti, ts); if( !dec ) { eprintf(_("Error in probe data")); return 1; } + + th_decode_ctl(dec,TH_DECCTL_GET_PPLEVEL_MAX,&pp_level_max, + sizeof(pp_level_max)); + pp_level=pp_level_max; + th_decode_ctl(dec,TH_DECCTL_SET_PPLEVEL,&pp_level,sizeof(pp_level)); + + keyframe_granule_shift = ti.keyframe_granule_shift; iframe_granule_offset = th_granule_frame(dec, 0); double fps = (double)ti.fps_numerator/ti.fps_denominator; diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 0154ff7f..ecb3fc64 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -335,7 +335,7 @@ PKG_3RD([libsndfile],[auto], [ . ]) PKG_3RD([libtheora],[auto], - [libtheora-1.1.1], + [libtheora-1.2.0], [ lib/.libs/libtheora.a \ lib/.libs/libtheoradec.a \ lib/.libs/libtheoraenc.a ], diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt index a8a08d84..642bdc6b 100644 --- a/cinelerra-5.1/thirdparty/downloads.txt +++ b/cinelerra-5.1/thirdparty/downloads.txt @@ -29,7 +29,7 @@ http://audiofile.68k.org/audiofile-0.3.6.tar.gz https://sourceforge.net/projects/twolame/ = GitHub / Releases = Source Code=twolame-0.4.0.tar.gz http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz http://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.gz -http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2 +http://downloads.xiph.org/releases/theora/libtheora-1.2.0.tar.xz # Added 0.7.4 in at least 2016; no new updates; not in HV or CV https://repology.org/project/a52dec/information https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.100 diff --git a/cinelerra-5.1/thirdparty/src/libtheora-1.2.0.tar.xz b/cinelerra-5.1/thirdparty/src/libtheora-1.2.0.tar.xz new file mode 100644 index 00000000..b516fd54 Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libtheora-1.2.0.tar.xz differ