Mercurial > mplayer.hg
comparison libmpdemux/muxer_lavf.c @ 35314:eaace9a7e822
Simplify: remove useless casts, NULL checks etc.
author | reimar |
---|---|
date | Sat, 10 Nov 2012 14:38:49 +0000 |
parents | 3e6a575bd47b |
children | 56081c772b4a |
comparison
equal
deleted
inserted
replaced
35313:2b211b058ee2 | 35314:eaace9a7e822 |
---|---|
113 muxer_priv_t *priv = muxer->priv; | 113 muxer_priv_t *priv = muxer->priv; |
114 muxer_stream_t *stream; | 114 muxer_stream_t *stream; |
115 muxer_stream_priv_t *spriv; | 115 muxer_stream_priv_t *spriv; |
116 AVCodecContext *ctx; | 116 AVCodecContext *ctx; |
117 | 117 |
118 if(!muxer || (type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO)) | 118 if(type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO) |
119 { | 119 { |
120 mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOWN TYPE %d\n", type); | 120 mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOWN TYPE %d\n", type); |
121 return NULL; | 121 return NULL; |
122 } | 122 } |
123 | 123 |
246 | 246 |
247 static void write_chunk(muxer_stream_t *stream, size_t len, unsigned int flags, double dts, double pts) | 247 static void write_chunk(muxer_stream_t *stream, size_t len, unsigned int flags, double dts, double pts) |
248 { | 248 { |
249 muxer_t *muxer = stream->muxer; | 249 muxer_t *muxer = stream->muxer; |
250 muxer_priv_t *priv = muxer->priv; | 250 muxer_priv_t *priv = muxer->priv; |
251 muxer_stream_priv_t *spriv = (muxer_stream_priv_t *) stream->priv; | 251 muxer_stream_priv_t *spriv = stream->priv; |
252 AVPacket pkt; | 252 AVPacket pkt; |
253 | 253 |
254 if(len) | 254 if(len) |
255 { | 255 { |
256 av_init_packet(&pkt); | 256 av_init_packet(&pkt); |