On Sat, Jun 04, 2016 at 03:35:34AM +0200, Michael Niedermayer wrote: > On Fri, Jun 03, 2016 at 09:48:02PM -0300, James Almer wrote: > > 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 <mich...@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 ||? > > yea, typo, makes no difference but ill fix it
applied [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB During times of universal deceit, telling the truth becomes a revolutionary act. -- George Orwell
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
