aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-03-17 12:17:44 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-03-17 16:50:15 +0100
commit7660c135a30e4da8e833e0d563e83002c46e0594 (patch)
tree43586a2782847d86fe8347c45b9309a446e59891
parentf875ba48739f59691661393eed1f7cc2371c93f1 (diff)
downloadffmpeg-7660c135a30e4da8e833e0d563e83002c46e0594.tar.gz
avformat/segment: Fix "occured" typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/segment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c
index ccedd04ff5..960a438a4d 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -407,7 +407,7 @@ static int segment_end(AVFormatContext *s, int write_trailer, int is_last)
rate = s->streams[i]->avg_frame_rate;/* Get fps from the video stream */
err = av_timecode_init_from_string(&tc, rate, tcr->value, s);
if (err < 0) {
- av_log(s, AV_LOG_WARNING, "Could not increment timecode, error occured during timecode creation.");
+ av_log(s, AV_LOG_WARNING, "Could not increment timecode, error occurred during timecode creation.");
break;
}
tc.start += (int)((seg->cur_entry.end_time - seg->cur_entry.start_time) * av_q2d(rate));/* increment timecode */