summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-11 23:38:54 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-11 23:38:54 +0000
commita8ea2c96c9e94a0ed4caf6aaacccda28b423352d (patch)
treeccf70418bf522a6a1f2bf23fcf48a288688068fc /libmpdemux
parent86d46b8ec9b36032de12bbf53c2eb5bb7396826c (diff)
downloadmpv-a8ea2c96c9e94a0ed4caf6aaacccda28b423352d.tar.bz2
mpv-a8ea2c96c9e94a0ed4caf6aaacccda28b423352d.tar.xz
dereference muxer->priv only after having checked muxer!=NULL in write_chunk(); closes cid 206
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17819 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_mpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 0ccc6741ab..abcc28c75c 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -327,11 +327,12 @@ static uint32_t calc_pack_hlen(muxer_priv_t *priv, muxer_headers_t *h);
static int add_frame(muxer_headers_t *spriv, uint64_t idur, uint8_t *ptr, int len, uint8_t pt, uint32_t temp_ref);
static muxer_stream_t* mpegfile_new_stream(muxer_t *muxer,int type){
- muxer_priv_t *priv = (muxer_priv_t*) muxer->priv;
+ muxer_priv_t *priv;
muxer_stream_t *s;
muxer_headers_t *spriv;
if (!muxer) return NULL;
+ priv = (muxer_priv_t*) muxer->priv;
if(muxer->avih.dwStreams>=MUXER_MAX_STREAMS){
mp_msg(MSGT_MUXER, MSGL_ERR, "Too many streams! increase MUXER_MAX_STREAMS !\n");
return NULL;