ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu Mar 17 12:17:44 2016 +0100| [7660c135a30e4da8e833e0d563e83002c46e0594] | committer: Michael Niedermayer
avformat/segment: Fix "occured" typo Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7660c135a30e4da8e833e0d563e83002c46e0594 --- libavformat/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index ccedd04..960a438 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 */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
