Module: libav
Branch: release/0.7
Commit: 9f9b731a3a2f873b3fb1e4f52e181a43fab6b89b

Author:    Anton Khirnov <[email protected]>
Committer: Reinhard Tartler <[email protected]>
Date:      Mon Sep 19 15:15:56 2011 +0200

movenc: fix NULL reference in mov_write_tkhd_tag

st may be NULL when there are more mov streams than AVStreams, e.g. when
chapters are present.

(cherry picked from commit c92a2a4eb8b883e82871c2415f757153d263b6b3)

Signed-off-by: Reinhard Tartler <[email protected]>

---

 libavformat/movenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5d9d3d1..b171c2d 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1215,7 +1215,7 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVTrack 
*track, AVStream *st)
     avio_wb32(pb, 0); /* reserved */
     avio_wb32(pb, 0); /* reserved */
     avio_wb16(pb, 0); /* layer */
-    avio_wb16(pb, st->codec->codec_type); /* alternate group) */
+    avio_wb16(pb, st ? st->codec->codec_type : 0); /* alternate group) */
     /* Volume, only for audio */
     if(track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
         avio_wb16(pb, 0x0100);

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to