[FFmpeg-cvslog] make the ordering of the return type and av_cold consistent

Michael Niedermayer git at videolan.org
Sun May 5 13:41:28 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 13:13:00 2013 +0200| [a1f234be11ea040d59f92279b331d5aeef3243b4] | committer: Michael Niedermayer

make the ordering of the return type and av_cold consistent

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1f234be11ea040d59f92279b331d5aeef3243b4
---

 libavcodec/dvdsubdec.c  |    2 +-
 libavcodec/libopusenc.c |    4 ++--
 libavfilter/f_sendcmd.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index d94f420..4e9c6c4 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -566,7 +566,7 @@ static int dvdsub_parse_extradata(AVCodecContext *avctx)
     return 1;
 }
 
-static int av_cold dvdsub_init(AVCodecContext *avctx)
+static av_cold int dvdsub_init(AVCodecContext *avctx)
 {
     DVDSubContext *ctx = avctx->priv_data;
     int ret;
diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index 04c297d..59caac7 100644
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -156,7 +156,7 @@ static int libopus_configure_encoder(AVCodecContext *avctx, OpusMSEncoder *enc,
     return OPUS_OK;
 }
 
-static int av_cold libopus_encode_init(AVCodecContext *avctx)
+static av_cold int libopus_encode_init(AVCodecContext *avctx)
 {
     LibopusEncContext *opus = avctx->priv_data;
     const uint8_t *channel_mapping;
@@ -359,7 +359,7 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt,
     return 0;
 }
 
-static int av_cold libopus_encode_close(AVCodecContext *avctx)
+static av_cold int libopus_encode_close(AVCodecContext *avctx)
 {
     LibopusEncContext *opus = avctx->priv_data;
 
diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c
index 319d503..9c7c5f5 100644
--- a/libavfilter/f_sendcmd.c
+++ b/libavfilter/f_sendcmd.c
@@ -422,7 +422,7 @@ static av_cold int init(AVFilterContext *ctx)
     return 0;
 }
 
-static void av_cold uninit(AVFilterContext *ctx)
+static av_cold void uninit(AVFilterContext *ctx)
 {
     SendCmdContext *sendcmd = ctx->priv;
     int i, j;



More information about the ffmpeg-cvslog mailing list