generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of some pointless '== NULL' / '!= 0' conditions in if statements.

Browse Source 
Originally committed as revision 20325 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-10-19 22:26:52 +00:00
parent 6f571d89c1
commit 96ff02f1b4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/libtheoraenc.c
View File

@@ -61,10 +61,10 @@ static int concatenate_packet(unsigned int* offset,
message = "extradata_size would overflow"; message = "extradata_size would overflow";
} else { } else {
newdata = av_realloc(avc_context->extradata, newsize); newdata = av_realloc(avc_context->extradata, newsize);
if (newdata == NULL) if (!newdata)
message = "av_realloc failed"; message = "av_realloc failed";
} }
if (message != NULL) { if (message) {
av_log(avc_context, AV_LOG_ERROR, "concatenate_packet failed: %s\n", message); av_log(avc_context, AV_LOG_ERROR, "concatenate_packet failed: %s\n", message);
return -1; return -1;
} }
@@ -98,7 +98,7 @@ static av_cold int encode_init(AVCodecContext* avc_context)
* time period between frames, but theora_info needs the framerate. */ * time period between frames, but theora_info needs the framerate. */
t_info.fps_numerator = avc_context->time_base.den; t_info.fps_numerator = avc_context->time_base.den;
t_info.fps_denominator = avc_context->time_base.num; t_info.fps_denominator = avc_context->time_base.num;
if (avc_context->sample_aspect_ratio.num != 0) { if (avc_context->sample_aspect_ratio.num) {
t_info.aspect_numerator = avc_context->sample_aspect_ratio.num; t_info.aspect_numerator = avc_context->sample_aspect_ratio.num;
t_info.aspect_denominator = avc_context->sample_aspect_ratio.den; t_info.aspect_denominator = avc_context->sample_aspect_ratio.den;
} else { } else {
@@ -133,7 +133,7 @@ static av_cold int encode_init(AVCodecContext* avc_context)
} }
/* Now initialise libtheora */ /* Now initialise libtheora */
if (theora_encode_init(&(h->t_state), &t_info) != 0) { if (theora_encode_init(&(h->t_state), &t_info)) {
av_log(avc_context, AV_LOG_ERROR, "theora_encode_init failed\n"); av_log(avc_context, AV_LOG_ERROR, "theora_encode_init failed\n");
return -1; return -1;
} }
@@ -152,13 +152,13 @@ static av_cold int encode_init(AVCodecContext* avc_context)
/* Header */ /* Header */
theora_encode_header(&(h->t_state), &o_packet); theora_encode_header(&(h->t_state), &o_packet);
if (concatenate_packet(&offset, avc_context, &o_packet) != 0) if (concatenate_packet(&offset, avc_context, &o_packet))
return -1; return -1;
/* Comment */ /* Comment */
theora_comment_init(&t_comment); theora_comment_init(&t_comment);
theora_encode_comment(&t_comment, &o_packet); theora_encode_comment(&t_comment, &o_packet);
if (concatenate_packet(&offset, avc_context, &o_packet) != 0) if (concatenate_packet(&offset, avc_context, &o_packet))
return -1; return -1;
/* Clear up theora_comment struct before we reset the packet */ /* Clear up theora_comment struct before we reset the packet */
theora_comment_clear(&t_comment); theora_comment_clear(&t_comment);
@@ -168,7 +168,7 @@ static av_cold int encode_init(AVCodecContext* avc_context)
/* Tables */ /* Tables */
theora_encode_tables(&(h->t_state), &o_packet); theora_encode_tables(&(h->t_state), &o_packet);
if (concatenate_packet(&offset, avc_context, &o_packet) != 0) if (concatenate_packet(&offset, avc_context, &o_packet))
return -1; return -1;
/* Set up the output AVFrame */ /* Set up the output AVFrame */
@@ -207,7 +207,7 @@ static int encode_frame(AVCodecContext* avc_context, uint8_t *outbuf,
/* Now call into theora_encode_YUVin */ /* Now call into theora_encode_YUVin */
result = theora_encode_YUVin(&(h->t_state), &t_yuv_buffer); result = theora_encode_YUVin(&(h->t_state), &t_yuv_buffer);
if (result != 0) { if (result) {
const char* message; const char* message;
switch (result) { switch (result) {
case -1: case -1: