From c04c3282b4334ff64cfd69d40fea010602e830fd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 11 Mar 2006 00:22:21 +0000 Subject: simplify AVFormatParameters NULL checks Originally committed as revision 5146 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/img2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/img2.c') diff --git a/libavformat/img2.c b/libavformat/img2.c index e38c694fc5..0f6ce6be64 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -187,13 +187,13 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->need_parsing= 1; } - if (!ap || !ap->time_base.num) { + if (!ap->time_base.num) { av_set_pts_info(st, 60, 1, 25); } else { av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den); } - if(ap && ap->width && ap->height){ + if(ap->width && ap->height){ st->codec->width = ap->width; st->codec->height= ap->height; } -- cgit v1.2.3