Skip to content
Snippets Groups Projects

Draft: Do not use album art if the file has a built-in cover.

Open Samo Golež requested to merge sagudev/vlc:master into master

Currently, VLC uses the same image if the files are from the same album, but with this PATCH, if the file has a built-in image, it will be used instead of the album image.

Edited by Samo Golež

Merge request reports

Members who can merge are allowed to add commits.

Merge request pipeline #128177 failed

Merge request pipeline failed for c2ecb3e8

Approved by
Merge blocked: 4 checks failed
Merge request must not be draft.
Pipeline must succeed.
Merge conflicts must be resolved.
Merge request must be rebased, because a fast-forward merge is not possible.

Merge details

  • The source branch is 16929 commits behind the target branch.
  • 2 commits will be added to master.
  • Source branch will not be deleted.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Samo Golež added 1 commit

    added 1 commit

    • 579c77be - Replace vlc stat with fopen to prevent ToCToU race.

    Compare with previous version

  • Samo Golež added 4 commits

    added 4 commits

    • 6ec8c0e0 - 1 commit from branch videolan:master
    • 7ce97cfa - Differentiate between song and album art cover in fetcher
    • f3346715 - Differentiate between song and album art cover in art.c
    • 19ea9b27 - Replace vlc stat with fopen to prevent ToCToU race.

    Compare with previous version

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež resolved all threads

    resolved all threads

  • François Cartegnie
  • Samo Golež added 4 commits

    added 4 commits

    • 6183c9af - 1 commit from branch videolan:master
    • 664a77c8 - Differentiate between song and album art cover in fetcher
    • 9cb211d8 - Differentiate between song and album art cover in art.c
    • 7cdd5426 - Replace vlc stat with fopen to prevent ToCToU race.

    Compare with previous version

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež added 1 commit

    added 1 commit

    • 6d36d253 - Fix warnings and use enum instead of b_unique

    Compare with previous version

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež added 16 commits

    added 16 commits

    • 6d36d253...91767679 - 12 commits from branch videolan:master
    • 556b2b3f - Differentiate between song and album art cover in fetcher
    • fc7ca3fd - Differentiate between song and album art cover in art.c
    • a8fa98ee - Replace vlc stat with fopen to prevent ToCToU race.
    • 71e03d21 - Fix warnings and use enum instead of b_unique

    Compare with previous version

  • François Cartegnie
  • François Cartegnie
  • Samo Golež added 3 commits

    added 3 commits

    • def16853 - 1 commit from branch videolan:master
    • 54121eea - Differentiate between song and album art cover in art.c
    • c629a10a - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež added 32 commits

    added 32 commits

    • c629a10a...dd3dc5e3 - 30 commits from branch videolan:master
    • 7e63c8fb - Differentiate between song and album art cover in art.c
    • bba7329f - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • François Cartegnie
  • Samo Golež added 19 commits

    added 19 commits

    • bba7329f...0e8c125e - 17 commits from branch videolan:master
    • 6623f0c2 - Differentiate between song and album art cover in art.c
    • c4d6a83e - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • Rémi Denis-Courmont
  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež added 24 commits

    added 24 commits

    • c4d6a83e...0b6b2423 - 22 commits from branch videolan:master
    • ee050f48 - Differentiate between song and album art cover in art.c
    • 6f01a647 - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • Rémi Denis-Courmont
  • Samo Golež added 2 commits

    added 2 commits

    • c3d8bd6e - Differentiate between song and album art cover in art.c
    • 4c0f65fd - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež added 67 commits

    added 67 commits

    • 4c0f65fd...68b27c23 - 65 commits from branch videolan:master
    • 149b846e - Differentiate between song and album art cover in art.c
    • 2230e473 - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • Samo Golež resolved all threads

    resolved all threads

  • Samo Golež added 10 commits

    added 10 commits

    • 2230e473...e7458985 - 8 commits from branch videolan:master
    • 47ed8f0f - Differentiate between song and album art cover in art.c
    • 38f76b4e - Differentiate between song and album art cover in fetcher

    Compare with previous version

  • Do not merge: totally broken rebases

  • I use GitLabs rebase button.

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading