Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'

* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
  mxf: Remove a typo

Conflicts:
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/mxfdec.c

@@ -1572,8 +1572,8 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
                 st->codec->sample_rate = descriptor->sample_rate.num / descriptor->sample_rate.den;
                 avpriv_set_pts_info(st, 64, descriptor->sample_rate.den, descriptor->sample_rate.num);
             } else {
-                av_log(mxf->fc, AV_LOG_WARNING,
-                       "invalid sample rate (%d/%d) found for stream #%d, time base forced to 1/48000\n",
+                av_log(mxf->fc, AV_LOG_WARNING, "invalid sample rate (%d/%d) "
+                       "found for stream #%d, time base forced to 1/48000\n",
                        descriptor->sample_rate.num, descriptor->sample_rate.den,
                        st->index);
                 avpriv_set_pts_info(st, 64, 1, 48000);