[FFmpeg-cvslog] Fix various uninitialized variable warnings

Clément Bœsch git at videolan.org
Thu Jun 2 10:54:06 CEST 2011


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun May 29 21:02:20 2011 +0200| [b443447536116f2843097f26a693478c66dcbe02] | committer: Clément Bœsch

Fix various uninitialized variable warnings

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b443447536116f2843097f26a693478c66dcbe02
---

 ffplay.c                  |    2 +-
 libavformat/iff.c         |    2 ++
 libavformat/matroskadec.c |    3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index ffe1c0f..74d1f10 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1740,7 +1740,7 @@ static int video_thread(void *arg)
 {
     VideoState *is = arg;
     AVFrame *frame= avcodec_alloc_frame();
-    int64_t pts_int, pos;
+    int64_t pts_int = AV_NOPTS_VALUE, pos = -1;
     double pts;
     int ret;
 
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 2dd1ef7..a0a4374 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -326,6 +326,8 @@ static int iff_read_packet(AVFormatContext *s,
         buf = pkt->data;
         bytestream_put_be16(&buf, 2);
         ret = avio_read(pb, buf, iff->body_size);
+    } else {
+        av_abort();
     }
 
     if(iff->sent_bytes == 0)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 569b95f..031e89a 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1037,7 +1037,8 @@ static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
     char *line, *layer, *ptr = pkt->data, *end = ptr+pkt->size;
     for (; *ptr!=',' && ptr<end-1; ptr++);
     if (*ptr == ',')
-        layer = ++ptr;
+        ptr++;
+    layer = ptr;
     for (; *ptr!=',' && ptr<end-1; ptr++);
     if (*ptr == ',') {
         int64_t end_pts = pkt->pts + display_duration;



More information about the ffmpeg-cvslog mailing list