GitHub and Releases
Hi, I am trying to clone from GitHub(https://git.ffmpeg.org/ffmpeg.git) the same source code that can be found in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2. What branch in https://git.ffmpeg.org/ffmpeg.git contains the same 4.4.1 source code as in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2 When I checkout release/4.4 the source code from GitHub is different from the source in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2. Thank you for your time. Bryce Bryce Chester Newman | Principal Developer p: +12069255045 |
Hi Bryce On Wed, Dec 15, 2021 at 14:51:40 +0000, Bryce Newman wrote:
I am trying to clone from GitHub(https://git.ffmpeg.org/ffmpeg.git) the same source code that can be found in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2. What branch in https://git.ffmpeg.org/ffmpeg.git contains the same 4.4.1 source code as in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2 When I checkout release/4.4 the source code from GitHub is different from the source in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2.
Releases correspond to tags, not branches. You want to check out tag "n4.4.1". Well, "want". Why do you want the exact same source code? (The 4.4 branch is for developing what becomes 4.4.2, 4.4.3, ...) Cheers, Moritz
Thank you for the response. I am waiting on a patch https://patchwork.ffmpeg.org/project/ffmpeg/patch/DM6PR08MB60732B5D77656C74C... too be approved and it may not be approved/merged into 4.4.2, etc anytime soon, so I need to compile against what is a known working version of ffmpeg and external libs used in https://github.com/jrottenberg/ffmpeg/blob/main/docker-images/4.4/ubuntu2004.... From: ffmpeg-user <ffmpeg-user-bounces@ffmpeg.org> on behalf of Moritz Barsnick <barsnick@gmx.net> Date: Wednesday, December 15, 2021 at 9:12 AM To: FFmpeg user discussions <ffmpeg-user@ffmpeg.org> Subject: [EXTERNAL] Re: [FFmpeg-user] GitHub and Releases Hi Bryce On Wed, Dec 15, 2021 at 14:51:40 +0000, Bryce Newman wrote:
I am trying to clone from GitHub(https://git.ffmpeg.org/ffmpeg.git) the same source code that can be found in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2. What branch in https://git.ffmpeg.org/ffmpeg.git contains the same 4.4.1 source code as in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2 When I checkout release/4.4 the source code from GitHub is different from the source in https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2.
Releases correspond to tags, not branches. You want to check out tag "n4.4.1". Well, "want". Why do you want the exact same source code? (The 4.4 branch is for developing what becomes 4.4.2, 4.4.3, ...) Cheers, Moritz _______________________________________________ ffmpeg-user mailing list ffmpeg-user@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-user To unsubscribe, visit link above, or email ffmpeg-user-request@ffmpeg.org with subject "unsubscribe". Bryce Chester Newman | Principal Developer p: +12069255045 |
On Wed, Dec 15, 2021 at 16:44:13 +0000, Bryce Newman wrote:
I am waiting on a patch https://patchwork.ffmpeg.org/project/ffmpeg/patch/DM6PR08MB60732B5D77656C74C... too be approved and it may not be approved/merged into 4.4.2, etc anytime soon,
I don't see that this is likely to be merged (i.e. backported) into 4.4.2. New features only go into the development branch, which will then become 4.5 or whatever is next there.
so I need to compile against what is a known working version of ffmpeg and external libs used in https://github.com/jrottenberg/ffmpeg/blob/main/docker-images/4.4/ubuntu2004....
If ffmpeg 4.4.1 compiles againt those libs, so will ffmpeg git master HEAD. You can probably just replace https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 with a link to the snapshot: https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 And even apply your patch right after unpacking this. Cheers, Moritz
Thank you. So just talking about the patch now… Which branch should I be in to add my patch? I assume that is release/4.4? Here are the branches I see. git branch -r master origin/HEAD -> origin/master origin/master origin/oldabi origin/release/0.10 origin/release/0.11 origin/release/0.5 origin/release/0.6 origin/release/0.7 origin/release/0.8 origin/release/0.9 origin/release/1.0 origin/release/1.1 origin/release/1.2 origin/release/2.0 origin/release/2.1 origin/release/2.2 origin/release/2.3 origin/release/2.4 origin/release/2.5 origin/release/2.6 origin/release/2.7 origin/release/2.8 origin/release/3.0 origin/release/3.1 origin/release/3.2 origin/release/3.3 origin/release/3.4 origin/release/4.0 origin/release/4.1 origin/release/4.2 origin/release/4.3 origin/release/4.4 From: ffmpeg-user <ffmpeg-user-bounces@ffmpeg.org> on behalf of Moritz Barsnick <barsnick@gmx.net> Date: Wednesday, December 15, 2021 at 12:00 PM To: FFmpeg user discussions <ffmpeg-user@ffmpeg.org> Subject: Re: [FFmpeg-user] [EXTERNAL] Re: GitHub and Releases On Wed, Dec 15, 2021 at 16:44:13 +0000, Bryce Newman wrote:
I am waiting on a patch https://patchwork.ffmpeg.org/project/ffmpeg/patch/DM6PR08MB60732B5D77656C74C... too be approved and it may not be approved/merged into 4.4.2, etc anytime soon,
I don't see that this is likely to be merged (i.e. backported) into 4.4.2. New features only go into the development branch, which will then become 4.5 or whatever is next there.
so I need to compile against what is a known working version of ffmpeg and external libs used in https://github.com/jrottenberg/ffmpeg/blob/main/docker-images/4.4/ubuntu2004....
If ffmpeg 4.4.1 compiles againt those libs, so will ffmpeg git master HEAD. You can probably just replace https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 with a link to the snapshot: https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 And even apply your patch right after unpacking this. Cheers, Moritz _______________________________________________ ffmpeg-user mailing list ffmpeg-user@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-user To unsubscribe, visit link above, or email ffmpeg-user-request@ffmpeg.org with subject "unsubscribe". Bryce Chester Newman | Principal Developer p: +12069255045 |
On Wed, Dec 15, 2021 at 19:21:42 +0000, Bryce Newman wrote:
So just talking about the patch now… Which branch should I be in to add my patch? I assume that is release/4.4? Here are the branches I see.
Any contributed patches should be developed against and apply to master: https://www.ffmpeg.org/developer.html Often, they also apply cleanly to older branches. Yet that is only of concern to you if you want to compile an older version with your patch. If a contributed patch is eventually merged, it can be backported to the old release branches, if it's considered a reasonable bug fix. This backporting is then usually done by the upstream developers. Cheers, Moritz
Ok. Perfect. This patch https://patchwork.ffmpeg.org/project/ffmpeg/patch/DM6PR08MB60732B5D77656C74C... was created using the master branch. Now to figure out why I get “Failed to apply patch.”. Apparently, something to do with the format I gather. From: ffmpeg-user <ffmpeg-user-bounces@ffmpeg.org> on behalf of Moritz Barsnick <barsnick@gmx.net> Date: Wednesday, December 15, 2021 at 12:37 PM To: FFmpeg user discussions <ffmpeg-user@ffmpeg.org> Subject: Re: [FFmpeg-user] [EXTERNAL] Re: GitHub and Releases On Wed, Dec 15, 2021 at 19:21:42 +0000, Bryce Newman wrote:
So just talking about the patch now… Which branch should I be in to add my patch? I assume that is release/4.4? Here are the branches I see.
Any contributed patches should be developed against and apply to master: https://www.ffmpeg.org/developer.html Often, they also apply cleanly to older branches. Yet that is only of concern to you if you want to compile an older version with your patch. If a contributed patch is eventually merged, it can be backported to the old release branches, if it's considered a reasonable bug fix. This backporting is then usually done by the upstream developers. Cheers, Moritz _______________________________________________ ffmpeg-user mailing list ffmpeg-user@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-user To unsubscribe, visit link above, or email ffmpeg-user-request@ffmpeg.org with subject "unsubscribe". Bryce Chester Newman | Principal Developer p: +12069255045 |
participants (2)
-
Bryce Newman -
Moritz Barsnick