Merge branch 'master' into f34

.gitignore

@@ -24,3 +24,4 @@ ffmpeg-*.rpm
 /ffmpeg-20210125.tar.bz2
 /ffmpeg-20210218.tar.bz2
 /ffmpeg-20210312.tar.bz2
+/ffmpeg-20210323.tar.bz2

ffmpeg-snapshot.sh

@@ -17,6 +17,7 @@ date=$(date +%Y%m%d)
 pushd "$tmp"
 git clone git://git.ffmpeg.org/ffmpeg.git
 cd ffmpeg
+git checkout release/4.4
 git rev-parse HEAD
-git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
+git archive --prefix="ffmpeg-${date}/" --format=tar release/4.4 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
 popd

ffmpeg.spec

@@ -1,8 +1,8 @@
 # TODO: add make test to %%check section
 
 #global branch  oldabi-
-%global date    20210312
-%global commit  51367267c8a9f1a840f5e810f8c788e6e03712a5
+%global date    20210323
+%global commit  0be265e9a100adc778c1c3cf52155a6326043b85
 %global rel %(c=%{commit}; echo ${c:0:7})
 
 %ifarch %{ix86}
@@ -111,7 +111,7 @@ ExclusiveArch: armv7hnl
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg%{?flavor}
 Version:        4.4
-Release:        0.5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release:        0.6%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
 License:        %{ffmpeg_license}
 URL:            http://ffmpeg.org/
 %if 0%{?date}
@@ -478,6 +478,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
 
 
 %changelog
+* Tue Mar 23 2021 Leigh Scott <leigh123linux@gmail.com> - 4.4-0.6.20210323git0be265e
+- Update to 4.4-0.6.20210323git0be265e
+- Switch to release/4.4 branch
+
 * Fri Mar 12 2021 Leigh Scott <leigh123linux@gmail.com> - 4.4-0.5.20210312git5136726
 - Update to 20210312git5136726
 

sources

@@ -1 +1 @@
-SHA512 (ffmpeg-20210312.tar.bz2) = b13d43eb465d87944a7c7c335c046e1ee64993193a82eaf22abd0608df20c4f09c6a63a8dc69034e8990567958c195d4abd1e83ec16d87287296d840cec10b98
+SHA512 (ffmpeg-20210323.tar.bz2) = 44e35678d2d03288c820f6b8d9d2656ee50de3f38a0bd7a96f9ab094d55b07af0e78c3c70a300df0a07aabb7739fd299071cdc9cf7fda5185bfe96819db8fb8d