Changeset 861

Timestamp:

04/20/08 21:02:17 (6 months ago)

Author:

astrange

Message:

Complain, but don't crash if the parser is NULL when it shouldn't be.

Files:

• trunk/FFusionCodec.c (modified) (1 diff)
• trunk/bitstream_info.c (modified) (1 diff)

trunk/FFusionCodec.c

@@ -682 +682 @@
-                        glob->begin.parser = ffusionParserInit(codecID);
-                
+                if ((codecID == CODEC_ID_MPEG4 || codecID == CODEC_ID_H264) && !glob->begin.parser)
+                        Codecprintf(glob->fileLog, "This is a parseable format, but we couldn't open a parser!\n");
+                
-        // we do the same for the AVCodecContext since all context values are
-        // correctly initialized when calling the alloc function

trunk/bitstream_info.c

@@ -867 +867 @@
-int ffusionIsParsedVideoDecodable(FFusionParserContext *parser)
-{
+        if (!parser) return 1;
+        
-        if (parser->parserStructure == &ffusionH264Parser) {
-                H264ParserContext *h264parser = parser->internalContext;