summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_lavf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index d78db13b02..da1876a3a6 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -103,17 +103,17 @@ static URLProtocol mp_protocol = {
static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
{
- if(!muxer) return NULL;
- muxer_priv_t *priv = (muxer_priv_t*) muxer->priv;
+ muxer_priv_t *priv;
muxer_stream_t *stream;
muxer_stream_priv_t *spriv;
AVCodecContext *ctx;
- if(type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO)
+ if(!muxer || (type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO))
{
- mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOW TYPE %d\n", type);
+ mp_msg(MSGT_MUXER, MSGL_ERR, "NULL MUXER PASSED OR UNKNOW TYPE %d\n", type);
return NULL;
}
+ priv = (muxer_priv_t*) muxer->priv;
stream = (muxer_stream_t*) calloc(1, sizeof(muxer_stream_t));
if(!stream)