[SCM] libav/experimental: Remove pointless parentheses.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:53:16 UTC 2013
The following commit has been merged in the experimental branch:
commit 11eb3cea7339633ea031b3c65da4778b5d9b38d1
Author: Diego Biurrun <diego at biurrun.de>
Date: Mon Oct 19 15:14:00 2009 +0000
Remove pointless parentheses.
Originally committed as revision 20311 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index fb05e5a..f9ec59e 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -59,9 +59,8 @@ static int concatenate_packet(unsigned int* offset, AVCodecContext* avc_context,
message = "extradata_size would overflow";
} else {
newdata = av_realloc(avc_context->extradata, newsize);
- if (newdata == NULL) {
+ if (newdata == NULL)
message = "av_realloc failed";
- }
}
if (message != NULL) {
av_log(avc_context, AV_LOG_ERROR, "concatenate_packet failed: %s\n", message);
@@ -151,16 +150,14 @@ static av_cold int encode_init(AVCodecContext* avc_context)
/* Header */
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 ) != 0)
return -1;
- }
/* Comment */
theora_comment_init( &t_comment );
theora_encode_comment( &t_comment, &o_packet );
- if (concatenate_packet( &offset, avc_context, &o_packet ) != 0) {
+ if (concatenate_packet( &offset, avc_context, &o_packet ) != 0)
return -1;
- }
/* Clear up theora_comment struct before we reset the packet */
theora_comment_clear( &t_comment );
/* And despite documentation to the contrary, theora_comment_clear
@@ -169,9 +166,8 @@ static av_cold int encode_init(AVCodecContext* avc_context)
/* Tables */
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 ) != 0)
return -1;
- }
/* Set up the output AVFrame */
avc_context->coded_frame= avcodec_alloc_frame();
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list