Mercurial > libavformat.hg

diff raw.c @ 1003:2d57ce58f576 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify AVFormatParameters NULL checks
author michael
date Sat, 11 Mar 2006 00:22:21 +0000
parents 7f8b1a1ac020
children 26d75e74c7b7
line wrap: on
line diff
--- a/raw.c	Wed Mar 08 21:51:39 2006 +0000
+++ b/raw.c	Sat Mar 11 00:22:21 2006 +0000
@@ -48,7 +48,7 @@
     st = av_new_stream(s, 0);
     if (!st)
         return AVERROR_NOMEM;
-    if (ap) {
+
         id = s->iformat->value;
         if (id == CODEC_ID_RAWVIDEO) {
             st->codec->codec_type = CODEC_TYPE_VIDEO;
@@ -74,9 +74,6 @@
         default:
             return -1;
         }
-    } else {
-        return -1;
-    }
     return 0;
 }
 
@@ -289,7 +286,7 @@
 
     /* for mjpeg, specify frame rate */
     /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/
-    if (ap && ap->time_base.num) {
+    if (ap->time_base.num) {
         av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
     } else if ( st->codec->codec_id == CODEC_ID_MJPEG ||
                 st->codec->codec_id == CODEC_ID_MPEG4 ||