Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 77549f4b7513
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13295e7f5523
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 15, 2021

  1. mplayer: fix build failure with ffmpeg 4.4 

    Backport SVN revision 38199.
    @vs49688
    vs49688 committed May 15, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    vs49688 Zane van Iperen
    GPG key ID: 68616B2D8AC4DCC5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    960cd68 View commit details

  2. Merge #123068: mplayer: fix build failure with ffmpeg 4.4

    @vcunat
    vcunat committed May 15, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    13295e7 View commit details
Showing with 24 additions and 0 deletions.
  1. +2 −0 pkgs/applications/video/mplayer/default.nix
  2. +22 −0 pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch
2 changes: 2 additions & 0 deletions pkgs/applications/video/mplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,8 @@ stdenv.mkDerivation rec {
rm -rf ffmpeg
'';

patches = [ ./svn-r38199-ffmpeg44fix.patch ];

depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib;
22 changes: 22 additions & 0 deletions pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Index: libmpcodecs/ad_spdif.c
===================================================================
diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c
--- a/libmpcodecs/ad_spdif.c (revision 38198)
+++ b/libmpcodecs/ad_spdif.c (revision 38199)
@@ -298,14 +298,8 @@
if (spdif_ctx->header_written)
av_write_trailer(lavf_ctx);
av_freep(&lavf_ctx->pb);
- if (lavf_ctx->streams) {
- av_freep(&lavf_ctx->streams[0]->codec);
- av_freep(&lavf_ctx->streams[0]->info);
- av_freep(&lavf_ctx->streams[0]);
- }
- av_freep(&lavf_ctx->streams);
- av_freep(&lavf_ctx->priv_data);
+ avformat_free_context(lavf_ctx);
+ lavf_ctx = NULL;
}
- av_freep(&lavf_ctx);
av_freep(&spdif_ctx);
}