diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-03-11 00:22:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-03-11 00:22:21 +0000 |
| commit | c04c3282b4334ff64cfd69d40fea010602e830fd (patch) | |
| tree | b07e0f447e3146669703bf86229925a44ebd628e /libavformat/img2.c | |
| parent | e7c8206e5c4ee83eccb487583331fb39ba73a136 (diff) | |
| download | ffmpeg-c04c3282b4334ff64cfd69d40fea010602e830fd.tar.gz | |
simplify AVFormatParameters NULL checks
Originally committed as revision 5146 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |