On Tue, 16 Aug 2011 19:09:22 -0700, Alex Converse <alex.conve...@gmail.com> 
wrote:
> ---
>  avconv.c |   14 +++++++++++---
>  1 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/avconv.c b/avconv.c
> index b3a4ab7..0751f19 100644
> --- a/avconv.c
> +++ b/avconv.c
> @@ -1098,7 +1098,7 @@ static void do_video_out(AVFormatContext *s,
>                           AVFrame *in_picture,
>                           int *frame_size, float quality)
>  {
> -    int nb_frames, i, ret;
> +    int nb_frames, i, ret, format_video_sync;
>      AVFrame *final_picture;
>      AVCodecContext *enc, *dec;
>      double sync_ipts;
> @@ -1113,12 +1113,20 @@ static void do_video_out(AVFormatContext *s,
>  
>      *frame_size = 0;
>  
> -    if(video_sync_method){
> +    format_video_sync = video_sync_method;
> +    if (format_video_sync < 0) {
> +        if (s->oformat->flags & AVFMT_VARIABLE_FPS)
> +            format_video_sync = 2;
> +        else
> +            format_video_sync = 1;

format_video_sync = s->oformat->flags & AVFMT_VARIABLE_FPS ? 2 : 1; ?

Also note to self: video_sync_method looks like another abused global to
be rescued.

-- 
Anton Khirnov
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to