diff --git a/common/av_common.c b/common/av_common.c
index 2d976bbc8d..bc2845d4d4 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -55,7 +55,6 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
 {
     mp_lavc_set_extradata(avctx, st->extradata, st->extradata_size);
     avctx->codec_tag                = st->codec_tag;
-    avctx->stream_codec_tag         = st->stream_codec_tag;
     avctx->bit_rate                 = st->bit_rate;
     avctx->width                    = st->width;
     avctx->height                   = st->height;
@@ -67,6 +66,8 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
     avctx->block_align              = st->block_align;
     avctx->channel_layout           = st->channel_layout;
     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+    // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+    avctx->stream_codec_tag         = st->stream_codec_tag;
 }
 
 // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.