From 16d03ed36206a764971a2a2780fe2b4c00d5f2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 14 Apr 2025 18:18:06 +0300
Subject: [PATCH] fmp4mux: Handle the case of multiple tags per taglist
 correctly

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2204>
---
 mux/fmp4/src/fmp4mux/imp.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mux/fmp4/src/fmp4mux/imp.rs b/mux/fmp4/src/fmp4mux/imp.rs
index 24728ca9b..b864b6e8e 100644
--- a/mux/fmp4/src/fmp4mux/imp.rs
+++ b/mux/fmp4/src/fmp4mux/imp.rs
@@ -3454,7 +3454,8 @@ impl FMP4Mux {
                             );
                         }
                         language_code = Stream::parse_language_code(lang);
-                    } else if let Some(orientation) = tag.get::<gst::tags::ImageOrientation>() {
+                    }
+                    if let Some(orientation) = tag.get::<gst::tags::ImageOrientation>() {
                         gst::trace!(
                             CAT,
                             obj = pad,
@@ -3467,7 +3468,8 @@ impl FMP4Mux {
                         } else {
                             stream_orientation = Some(TransformMatrix::from_tag(self, ev));
                         }
-                    } else if let Some(bitrate) = tag
+                    }
+                    if let Some(bitrate) = tag
                         .get::<gst::tags::MaximumBitrate>()
                         .filter(|br| br.get() > 0 && br.get() < u32::MAX)
                     {
@@ -3487,7 +3489,8 @@ impl FMP4Mux {
                             );
                         }
                         max_bitrate = Some(bitrate);
-                    } else if let Some(bitrate) = tag
+                    }
+                    if let Some(bitrate) = tag
                         .get::<gst::tags::Bitrate>()
                         .filter(|br| br.get() > 0 && br.get() < u32::MAX)
                     {
@@ -4430,7 +4433,8 @@ impl AggregatorImpl for FMP4Mux {
                             stream.language_code = Some(language_code);
                         }
                     }
-                } else if let Some(tag_value) = tag.get::<gst::tags::ImageOrientation>() {
+                }
+                if let Some(tag_value) = tag.get::<gst::tags::ImageOrientation>() {
                     let orientation = tag_value.get();
                     gst::trace!(
                         CAT,