Ticket #1030 (closed defect: fixed)

Opened 2 years ago

Last modified 2 years ago

Merge libffms from trunk to 2.1.8

Reported by: verm Owned by: TheFluff
Priority: normal Milestone: 2.1.8
Component: General Version: devel
Severity: minor Keywords:
Cc: Platform: All
Sub Component:

Description

libffms needs to be merged back to 2.1.8, as well as all corresponding changes in our code to match the new API.

Change History

comment:1 Changed 2 years ago by verm

  • Status changed from new to assigned

Hand over to TheFluff, he's the best person to do it.

comment:2 Changed 2 years ago by thefluff

(In [3778]) Merge r3145 (multiple tracks support in the ffms2 providers) into 2.1.8. Updates #1030.

comment:3 Changed 2 years ago by thefluff

(In [3779]) Merge r3155 into 2.1.8. Updates #1030.

comment:4 Changed 2 years ago by thefluff

(In [3780]) Merge r3178 (removal of fps parameter to video provider constructors) into 2.1.8. Updates #1030.

comment:5 Changed 2 years ago by thefluff

(In [3781]) Merge the Great Colorspace Reworking into 2.1.8. Merges r3180 and r3185; updates #926 and #1030.

comment:6 Changed 2 years ago by thefluff

(In [3782]) Merge r3248 (log option for ffms2) into 2.1.8. Updates #1030.

comment:7 Changed 2 years ago by thefluff

(In [3783]) Merge r3377 (reindexing bugfix) into 2.1.8. Updates #1030.

comment:8 Changed 2 years ago by thefluff

(In [3784]) Merge r3452 into 2.1.8. Updates #1030.

comment:9 Changed 2 years ago by thefluff

(In [3785]) Merge r3214 into 2.1.8. Updates #1030.

comment:10 Changed 2 years ago by thefluff

(In [3786]) Backport the removal of Aegisub::String into 2.1.8. Merges r3215, r3216 and r3220. Updates #940 and #1030.

comment:11 Changed 2 years ago by thefluff

(In [3787]) Backport all trunk updates of libffms to 2.1.8. Merges r3574-3575,3577-3578,3580,3585-3586,3639,3664,3690 and 3769. Updates #1030. Note: compilation BROKEN in this revision!

comment:12 Changed 2 years ago by thefluff

(In [3788]) Merge r3224 (removal of unnecessary string conversions) into 2.1.8. Updates #1030.

comment:13 Changed 2 years ago by thefluff

  • Status changed from assigned to closed
  • Resolution set to fixed

(In [3789]) Complete backporting of ffms2 providers by merging r3576 into 2.1.8. Fixes compilation that was broken in r3787 and closes #1030.

comment:14 Changed 2 years ago by thefluff

(In [3790]) Revert r3789, conflict resolution was done wrong which screwed up the merge. Updates #1030.

comment:15 Changed 2 years ago by thefluff

(In [3791]) Redo the merge of r3576. Should be done the proper way now. Updates #1030.

comment:16 Changed 2 years ago by thefluff

(In [3792]) Merge r3164 (trackmask mixup) into 2.1.8. Missed this earlier. Updates #1030.

comment:17 Changed 2 years ago by thefluff

(In [3793]) Merge r3212 (silencing of a warning) into 2.1.8. Updates #1030.

Note: See TracTickets for help on using tickets.