lavu/timecode: Allow drop frame mode for 60000/1001 fps

Jason committed 13 years ago

Commit a717fa81 parent 55d66b22 files · +3 −3Browse files

Showing the changes to libavutil/timecode.c (1 of 2 files). Show all

Unified · Split

libavutil/timecode.c+2−2

@@ -152,8 +152,8 @@ static int check_timecode(void log_ctx, AVTimecode tc) · 151 unmodified lines
152	152	av_log(log_ctx, AV_LOG_ERROR, "Timecode frame rate must be specified\n");
153	153	return AVERROR(EINVAL);
154	154	}
155		− if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30) {
156		− av_log(log_ctx, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n");
	155	+ if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) {
	156	+ av_log(log_ctx, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 or 60000/1001 FPS\n");
157	157	return AVERROR(EINVAL);
158	158	}
159	159	if (check_fps(tc->fps) < 0) {