Changeset 235529f2aca9d8ee263d0723792e91d582f1816a

Timestamp:

08/07/08 21:36:48 (5 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1215545808 +0000

git-parent:

[da12022b26ca3f95c4038ceb73926603c27b8f1e]

git-author:

Laurent Aimar <fenrir@videolan.org> 1215545576 +0000

Message:

Fixed used of uninitialized memory on unsupported track.
Fixed usage of start_time.
(It should fix #799)

Files:

• modules/demux/avformat/demux.c (modified) (5 diffs)

modules/demux/avformat/demux.c

@@ -201 +201 @@
-        es_format_t  fmt;
-        vlc_fourcc_t fcc;
+        const char *psz_type = "unknown";
-
-        if( !GetVlcFourcc( cc->codec_id, NULL, &fcc, NULL ) )
@@ -222 +223 @@
-            fmt.audio.i_bitspersample = cc->bits_per_sample;
-            fmt.audio.i_blockalign = cc->block_align;
+            psz_type = "audio";
-            break;
-        case CODEC_TYPE_VIDEO:
@@ -232 +234 @@
-                *fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
-            }
+            psz_type = "video";
-            break;
-        case CODEC_TYPE_SUBTITLE:
-            es_format_Init( &fmt, SPU_ES, fcc );
-
+
+
+
-        default:
+            es_format_Init( &fmt, UNKNOWN_ES, 0 );
+            if( cc->codec_type == CODEC_TYPE_DATA )
+                psz_type = "data";
+            else if( cc->codec_type == CODEC_TYPE_ATTACHMENT )
+                psz_type = "attachment";
+
-            msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
-            break;
@@ -247 +258 @@
-
-        msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
-
-
+
-        TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
-    }
@@ -316 +326 @@
-
-    i_start_time = ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
-
+* 1000000 
-
-    p_frame->i_dts = ( pkt.dts == (int64_t)AV_NOPTS_VALUE ) ?
- - i_start_time
+
-        p_sys->ic->streams[pkt.stream_index]->time_base.num /
-
+ - i_start_time
-    p_frame->i_pts = ( pkt.pts == (int64_t)AV_NOPTS_VALUE ) ?
- - i_start_time
+
-        p_sys->ic->streams[pkt.stream_index]->time_base.num /
-
+ - i_start_time
-
-#ifdef AVFORMAT_DEBUG