Mercurial > mplayer.hg

diff libmpdemux/muxer_lavf.c @ 35314:eaace9a7e822

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify: remove useless casts, NULL checks etc.
author reimar
date Sat, 10 Nov 2012 14:38:49 +0000
parents 3e6a575bd47b
children 56081c772b4a
line wrap: on
line diff
--- a/libmpdemux/muxer_lavf.c	Sat Nov 10 14:31:14 2012 +0000
+++ b/libmpdemux/muxer_lavf.c	Sat Nov 10 14:38:49 2012 +0000
@@ -115,7 +115,7 @@
 	muxer_stream_priv_t *spriv;
 	AVCodecContext *ctx;
 
-	if(!muxer || (type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO))
+	if(type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO)
 	{
 		mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOWN TYPE %d\n", type);
 		return NULL;
@@ -248,7 +248,7 @@
 {
 	muxer_t *muxer = stream->muxer;
 	muxer_priv_t *priv = muxer->priv;
-	muxer_stream_priv_t *spriv = (muxer_stream_priv_t *) stream->priv;
+	muxer_stream_priv_t *spriv = stream->priv;
 	AVPacket pkt;
 
 	if(len)