aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-19 22:45:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-19 22:45:34 +0200
commita6186f3a0006d43950aaa5416b7e71c4b82f49f5 (patch)
tree50c53a13881219b14ed2e3855a49c34539645ed3 /libavformat/movenc.c
parent16c5d3b0d0a0070c9c2bae906039e3a412520eef (diff)
parentc92a2a4eb8b883e82871c2415f757153d263b6b3 (diff)
downloadffmpeg-a6186f3a0006d43950aaa5416b7e71c4b82f49f5.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: movenc: fix NULL reference in mov_write_tkhd_tag rmdec: Reject invalid deinterleaving parameters rv34: Fix potential overreads rv34: Fix buffer size used for MC of B frames after a resolution change rv34: Avoid NULL dereference on corrupted bitstream rv10: Reject slices that does not have the same type as the first one vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag vsrc_color: set output pos values to -1 vsrc_color: add @file doxy vsrc_buffer: remove duplicated file description eval: implement not() expression eval: add sqrt function for computing the square root rmdec: use the deinterleaving mode and not the codec when creating audio packets. lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails Conflicts: doc/eval.texi doc/filters.texi libavcodec/rv10.c libavfilter/vsrc_color.c libavformat/rmdec.c libavutil/avutil.h libavutil/eval.c tests/ref/fate/eval Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 29de5b0ae8..aba934c33d 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1226,7 +1226,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);