1411883 - Minimize difference with upstream FFmpeg and our ffvpx branch

Status: RESOLVED FIXED

(Core :: Audio/Video: Playback, enhancement)

Description

[Jean-Yves Avenard [:jya]]

In bug 1366201, FFmpeg was resync to upstream version 3.4

It was done by applying a diff on all the file we used.

Checking the files we actually use, there are differences that could make future resync difficult and patch not to apply.

We'll aim at reducing those differences so that we can simply copy the files across rather than applying diff files.

Comment 1

[Jean-Yves Avenard [:jya]]

Attachment: Bug 1411883 - P1. Copy files as-is from FFmpeg upstream.

r?gerald

Review commit: https://reviewboard.mozilla.org/r/193324/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/193324/

Comment 2

[Jean-Yves Avenard [:jya]]

Attachment: Bug 1411883 - P2. Update resync documentation.

Review commit: https://reviewboard.mozilla.org/r/193326/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/193326/

Comment 3

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

Comment on attachment 8922270 [details]
Bug 1411883 - P1. Copy files as-is from FFmpeg upstream.

https://reviewboard.mozilla.org/r/193324/#review198540

Comment 4

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

Comment on attachment 8922271 [details]
Bug 1411883 - P2. Update resync documentation.

https://reviewboard.mozilla.org/r/193326/#review198542

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/10722a700335
P1. Copy files as-is from FFmpeg upstream. r=gerald
https://hg.mozilla.org/integration/autoland/rev/3cc70231a4dc
P2. Update resync documentation. r=gerald

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/10722a700335
https://hg.mozilla.org/mozilla-central/rev/3cc70231a4dc