Mercurial > mplayer.hg

comparison libmpdemux/muxer_lavf.c @ 35315:56081c772b4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove another pointless NULL check.
author reimar
date Sat, 10 Nov 2012 14:41:32 +0000
parents eaace9a7e822
children ba53cfe2547b
comparison
equal deleted inserted replaced
35314:eaace9a7e822 35315:56081c772b4a
226 ctx->width = stream->bih->biWidth; 226 ctx->width = stream->bih->biWidth;
227 ctx->height = stream->bih->biHeight; 227 ctx->height = stream->bih->biHeight;
228 ctx->bit_rate = 800000; 228 ctx->bit_rate = 800000;
229 ctx->time_base.den = stream->h.dwRate; 229 ctx->time_base.den = stream->h.dwRate;
230 ctx->time_base.num = stream->h.dwScale; 230 ctx->time_base.num = stream->h.dwScale;
231 if(stream->bih && (stream->bih->biSize > sizeof(*stream->bih))) 231 if(stream->bih->biSize > sizeof(*stream->bih))
232 { 232 {
233 ctx->extradata_size = stream->bih->biSize - sizeof(*stream->bih); 233 ctx->extradata_size = stream->bih->biSize - sizeof(*stream->bih);
234 ctx->extradata = av_malloc(ctx->extradata_size); 234 ctx->extradata = av_malloc(ctx->extradata_size);
235 if(ctx->extradata != NULL) 235 if(ctx->extradata != NULL)
236 memcpy(ctx->extradata, stream->bih+1, ctx->extradata_size); 236 memcpy(ctx->extradata, stream->bih+1, ctx->extradata_size);