Accepting request 905444 from home:frispete:branches:multimedia:libs

- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains 
  a goto to a none existing label. In order to distinguish this
  patch from the original, I renamed it to
  ffmpeg-4.4-CVE-2020-22046.patch
- While at it, refresh the other patches with offsets

OBS-URL: https://build.opensuse.org/request/show/905444
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=167

ffmpeg-codec-choice.diff

@@ -11,11 +11,11 @@ reduced codec selection list.
  libavformat/matroskaenc.c |   19 +++++++++++++------
  1 file changed, 13 insertions(+), 6 deletions(-)
 
-Index: ffmpeg-4.3/libavformat/matroskaenc.c
+Index: b/libavformat/matroskaenc.c
 ===================================================================
---- ffmpeg-4.3.orig/libavformat/matroskaenc.c
-+++ ffmpeg-4.3/libavformat/matroskaenc.c
-@@ -2805,16 +2805,24 @@ static const AVClass matroska_class = {
+--- a/libavformat/matroskaenc.c
++++ b/libavformat/matroskaenc.c
+@@ -2834,16 +2834,24 @@ static const AVClass matroska_class = {
      .version    = LIBAVUTIL_VERSION_INT,
  };
  
@@ -44,7 +44,7 @@ Index: ffmpeg-4.3/libavformat/matroskaenc.c
      .init              = mkv_init,
      .deinit            = mkv_deinit,
      .write_header      = mkv_write_header,
-@@ -2876,8 +2884,7 @@ AVOutputFormat ff_matroska_audio_muxer =
+@@ -2905,8 +2913,7 @@ AVOutputFormat ff_matroska_audio_muxer =
      .mime_type         = "audio/x-matroska",
      .extensions        = "mka",
      .priv_data_size    = sizeof(MatroskaMuxContext),