diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:55:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:55:18 +0200 |
| commit | c28bca2bdef6c4671c25b1c0b25c489f11ffad80 (patch) | |
| tree | 83a87af23c6b2536889205a2d37dfac48f155b00 | |
| parent | 8aa6ffd8fa648c4e4e4819ed3976aba8ee8540f5 (diff) | |
| parent | ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1 (diff) | |
| download | ffmpeg-c28bca2bdef6c4671c25b1c0b25c489f11ffad80.tar.gz | |
Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
mxf: Remove a typo
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxfdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index f881df4656..dac98acaf3 100644 --- a/libavformat/mxfdec.c +++ b/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); |