diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-12 18:06:46 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-12 18:06:46 +0000 |
| commit | 661225715a42907d153bd8d37447bc89c88b02d1 (patch) | |
| tree | bb77b3466205d442bf134f99c4d4c8d201f96ddb /libmpdemux | |
| parent | 21fda01ab7a2061e0c2413d68ef30eb92e2332b6 (diff) | |
| download | mpv-661225715a42907d153bd8d37447bc89c88b02d1.tar.bz2 mpv-661225715a42907d153bd8d37447bc89c88b02d1.tar.xz | |
fixed C99-ism introduced with previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17830 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 8 |
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) |