diff options
| author | Jason <jason@cpcweb.com> | 2013-01-22 12:31:46 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 21:06:24 +0100 |
| commit | a717fa84ede90b7323db2a64f9309da31b0d378f (patch) | |
| tree | 9bad18ccfa86a79afd656212aa2aaada0d1935f8 /libavutil | |
| parent | 55d66b27902d3f566cd6cf6f08d4233dcdc338f5 (diff) | |
| download | ffmpeg-streaming-a717fa84ede90b7323db2a64f9309da31b0d378f.zip ffmpeg-streaming-a717fa84ede90b7323db2a64f9309da31b0d378f.tar.gz | |
lavu/timecode: Allow drop frame mode for 60000/1001 fps
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/timecode.c | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/timecode.c b/libavutil/timecode.c index 77d828d..5f9ebc2 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -152,8 +152,8 @@ static int check_timecode(void *log_ctx, AVTimecode *tc) av_log(log_ctx, AV_LOG_ERROR, "Timecode frame rate must be specified\n"); return AVERROR(EINVAL); } - if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30) { - av_log(log_ctx, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n"); + if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) { + av_log(log_ctx, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 or 60000/1001 FPS\n"); return AVERROR(EINVAL); } if (check_fps(tc->fps) < 0) { diff --git a/libavutil/version.h b/libavutil/version.h index 8e678fe..6e81f48 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -76,7 +76,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 15 -#define LIBAVUTIL_VERSION_MICRO 102 +#define LIBAVUTIL_VERSION_MICRO 103 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |
