summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-05 13:13:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-05 13:13:00 +0200
commita1f234be11ea040d59f92279b331d5aeef3243b4 (patch)
tree2301b3a25f3b6341964bcb943606bb47c8793d23
parent35623d833eeca1202685bfe0e4f3b5f3c1f1c512 (diff)
make the ordering of the return type and av_cold consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dvdsubdec.c2
-rw-r--r--libavcodec/libopusenc.c4
-rw-r--r--libavfilter/f_sendcmd.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index d94f420b92..4e9c6c43a5 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 04c297deba..59caac76c7 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 319d503361..9c7c5f5def 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;