[FFmpeg-cvslog] r10636 - trunk/libavformat/utils.c

[diego]

Author: diego
Date: Tue Oct  2 00:11:10 2007
New Revision: 10636

Log:
Add checking for codecid to has_codec_parameters().
patch by Ronald S. Bultje, rsbultje gmail com
Date: Sat, 29 Sep 2007 09:25:52 -0400
Subject: [FFmpeg-devel] [PATCH] has_codec_parameters() addition


Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Tue Oct  2 00:11:10 2007
@@ -1638,7 +1638,7 @@ static int has_codec_parameters(AVCodecC
         val = 1;
         break;
     }
-    return (val != 0);
+    return (enc->codec_id != CODEC_ID_NONE && val != 0);
 }
 
 static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
@@ -1803,9 +1803,6 @@ int av_find_stream_info(AVFormatContext 
                 break;
             if(st->parser && st->parser->parser->split && !st->codec->extradata)
                 break;
-            if (st->codec->codec_type == CODEC_TYPE_AUDIO &&
-                st->codec->codec_id == CODEC_ID_NONE)
-                break;
             if(st->first_dts == AV_NOPTS_VALUE)
                 break;
         }