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

Jason committed 13 years ago

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

Unified · Split

2 files

libavutil/timecode.c +2 −2
libavutil/version.h +1 −1

libavutil/timecode.c+2−2

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

libavutil/version.h+1−1

@@ -76,7 +76,7 @@ · 75 unmodified lines
76		76
77	#define LIBAVUTIL_VERSION_MAJOR 52	77	#define LIBAVUTIL_VERSION_MAJOR 52
78	#define LIBAVUTIL_VERSION_MINOR 15	78	#define LIBAVUTIL_VERSION_MINOR 15
79	#define LIBAVUTIL_VERSION_MICRO 102	79	#define LIBAVUTIL_VERSION_MICRO 103
80		80
81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
82	LIBAVUTIL_VERSION_MINOR, \	82	LIBAVUTIL_VERSION_MINOR, \