[FFmpeg-devel] [PATCH 1/2] Allow drop frame mode for 60000/1001 fps

Matthieu Bouron matthieu.bouron at gmail.com
Wed Jan 23 11:25:38 CET 2013


On Wed, Jan 23, 2013 at 7:13 AM, Jason Livingston <jason at cpcweb.com> wrote:
> ---
>  libavutil/timecode.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 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);
>      }

I think the LIBAVUTIL_VERSION_MICRO should be dumped.
Also, prefixing the commit message with lavu/timecode: would be great.

The patch itself LGTM.

Regards,
Matthieu

[...]


More information about the ffmpeg-devel mailing list