Add mediainfo back to image

If you're currently analyzing track language, missing mediainfo will
cause rescan tasks to hang indefinitely, preventing an update or sync of
the backends. This appears to have been removed in the 1.4.2 release.

Signed-off-by: Nathan Pawelek <npawelek@users.noreply.github.com>

apps/bazarr/Dockerfile

@@ -22,7 +22,11 @@ RUN \
 
 #hadolint ignore=DL3018,DL3013
 RUN \
+<<<<<<< HEAD
     apk add --no-cache ca-certificates ffmpeg python3 py3-lxml py3-numpy py3-gevent py3-cryptography py3-setuptools py3-psycopg2 py3-pillow unzip \
+=======
+    apk add --no-cache ca-certificates ffmpeg mediainfo python3 py3-lxml py3-numpy py3-gevent py3-cryptography py3-setuptools py3-psycopg2 py3-pillow unzip \
+>>>>>>> 114d1db (Add mediainfo back to image)
     && \
     apk add --no-cache --virtual .build-deps py3-pip gcc python3-dev musl-dev \
     && \