Mercurial > libavcodec.hg
comparison libschroedingerdec.c @ 10055:fdb318d12314 libavcodec
Simplify 'if' condition statements.
Drop useless '!= 0' from 'exp != 0', replace 'exp == 0' by '!exp'.
| author | diego |
|---|---|
| date | Sat, 15 Aug 2009 11:02:50 +0000 |
| parents | 54bc8a2727b0 |
| children | 646065f63290 |
comparison
equal
deleted
inserted
replaced
| 10054:8ab9fbad11b2 | 10055:fdb318d12314 |
|---|---|
| 194 } | 194 } |
| 195 | 195 |
| 196 avccontext->time_base.den = p_schro_params->format->frame_rate_numerator; | 196 avccontext->time_base.den = p_schro_params->format->frame_rate_numerator; |
| 197 avccontext->time_base.num = p_schro_params->format->frame_rate_denominator; | 197 avccontext->time_base.num = p_schro_params->format->frame_rate_denominator; |
| 198 | 198 |
| 199 if (p_schro_params->dec_pic.data[0] == NULL) | 199 if (!p_schro_params->dec_pic.data[0]) |
| 200 { | 200 { |
| 201 avpicture_alloc(&p_schro_params->dec_pic, | 201 avpicture_alloc(&p_schro_params->dec_pic, |
| 202 avccontext->pix_fmt, | 202 avccontext->pix_fmt, |
| 203 avccontext->width, | 203 avccontext->width, |
| 204 avccontext->height); | 204 avccontext->height); |
| 224 FfmpegSchroParseUnitContext parse_ctx; | 224 FfmpegSchroParseUnitContext parse_ctx; |
| 225 | 225 |
| 226 *data_size = 0; | 226 *data_size = 0; |
| 227 | 227 |
| 228 FfmpegSchroParseContextInit (&parse_ctx, buf, buf_size); | 228 FfmpegSchroParseContextInit (&parse_ctx, buf, buf_size); |
| 229 if (buf_size == 0) { | 229 if (!buf_size) { |
| 230 if (!p_schro_params->eos_signalled) { | 230 if (!p_schro_params->eos_signalled) { |
| 231 state = schro_decoder_push_end_of_stream(decoder); | 231 state = schro_decoder_push_end_of_stream(decoder); |
| 232 p_schro_params->eos_signalled = 1; | 232 p_schro_params->eos_signalled = 1; |
| 233 } | 233 } |
| 234 } | 234 } |
| 298 } while(outer); | 298 } while(outer); |
| 299 | 299 |
| 300 /* Grab next frame to be returned from the top of the queue. */ | 300 /* Grab next frame to be returned from the top of the queue. */ |
| 301 frame = ff_dirac_schro_queue_pop(&p_schro_params->dec_frame_queue); | 301 frame = ff_dirac_schro_queue_pop(&p_schro_params->dec_frame_queue); |
| 302 | 302 |
| 303 if (frame != NULL) { | 303 if (frame) { |
| 304 memcpy (p_schro_params->dec_pic.data[0], | 304 memcpy (p_schro_params->dec_pic.data[0], |
| 305 frame->components[0].data, | 305 frame->components[0].data, |
| 306 frame->components[0].length); | 306 frame->components[0].length); |
| 307 | 307 |
| 308 memcpy (p_schro_params->dec_pic.data[1], | 308 memcpy (p_schro_params->dec_pic.data[1], |