2 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index cca7725490..1d6683672b 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -159,6 +159,8 @@ static int init(sh_audio_t *sh_audio)
     }
     lavc_context->request_channels = opts->audio_output_channels;
     lavc_context->codec_tag = sh_audio->format; //FOURCC
+    if (sh_audio->gsh->lavf_codec_tag)
+        lavc_context->codec_tag = sh_audio->gsh->lavf_codec_tag;
     lavc_context->codec_type = AVMEDIA_TYPE_AUDIO;
     lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi
 
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 948fde2d00..10d494e48c 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -239,6 +239,8 @@ static int init(sh_video_t *sh)
     } else {
         avctx->pix_fmt = rawfmt;
     }
+    if (sh->gsh->lavf_codec_tag)
+        avctx->codec_tag = sh->gsh->lavf_codec_tag;
     avctx->stream_codec_tag = sh->video.fccHandler;
     avctx->idct_algo = lavc_param->idct_algo;
     avctx->error_concealment = lavc_param->error_concealment;