[FFmpeg-devel] [PATCH 1/2] avformat/dump: Print tbc value

[James Almer]

On 6/3/2016 7:12 PM, Michael Niedermayer wrote:
> Fixes regression of av_dump_format()
> Fixes part of Ticket 5444
> 
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavformat/dump.c |   11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/libavformat/dump.c b/libavformat/dump.c
> index 7ff5ef0..485e9fd 100644
> --- a/libavformat/dump.c
> +++ b/libavformat/dump.c
> @@ -492,16 +492,19 @@ static void dump_stream_format(AVFormatContext *ic, int i,
>          int fps = st->avg_frame_rate.den && st->avg_frame_rate.num;
>          int tbr = st->r_frame_rate.den && st->r_frame_rate.num;
>          int tbn = st->time_base.den && st->time_base.num;
> +        int tbc = st->codec->time_base.den && st->codec->time_base.num;
>  
> -        if (fps || tbr || tbn)
> +        if (fps || tbr || tbn | tbc)

Shouldn't this be ||?

>              av_log(NULL, AV_LOG_INFO, "%s", separator);
>  
>          if (fps)
> -            print_fps(av_q2d(st->avg_frame_rate), tbr || tbn ? "fps, " : "fps");
> +            print_fps(av_q2d(st->avg_frame_rate), tbr || tbn || tbc ? "fps, " : "fps");
>          if (tbr)
> -            print_fps(av_q2d(st->r_frame_rate), tbn ? "tbr, " : "tbr");
> +            print_fps(av_q2d(st->r_frame_rate), tbn || tbc ? "tbr, " : "tbr");
>          if (tbn)
> -            print_fps(1 / av_q2d(st->time_base), "tbn");
> +            print_fps(1 / av_q2d(st->time_base), tbc ? "tbn, " : "tbn");
> +        if (tbc)
> +            print_fps(1 / av_q2d(st->codec->time_base), "tbc");
>      }
>  
>      if (st->disposition & AV_DISPOSITION_DEFAULT)
>