[FFmpeg-cvslog] lavc: remove empty function
Paul B Mahol
git at videolan.org
Sat Mar 30 17:11:54 CET 2013
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Mar 30 03:02:41 2013 +0000| [95c7cad70cd8b4a6fe773c2bd421b1206c629e34] | committer: Paul B Mahol
lavc: remove empty function
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95c7cad70cd8b4a6fe773c2bd421b1206c629e34
---
libavcodec/v308dec.c | 7 -------
libavcodec/v408dec.c | 8 --------
libavcodec/xbmdec.c | 10 +---------
libavcodec/y41pdec.c | 7 -------
libavcodec/yuv4dec.c | 7 -------
5 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c
index b6f197d..75d65e8 100644
--- a/libavcodec/v308dec.c
+++ b/libavcodec/v308dec.c
@@ -72,19 +72,12 @@ static int v308_decode_frame(AVCodecContext *avctx, void *data,
return avpkt->size;
}
-static av_cold int v308_decode_close(AVCodecContext *avctx)
-{
-
- return 0;
-}
-
AVCodec ff_v308_decoder = {
.name = "v308",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_V308,
.init = v308_decode_init,
.decode = v308_decode_frame,
- .close = v308_decode_close,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"),
};
diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c
index 31c14dc..751650d 100644
--- a/libavcodec/v408dec.c
+++ b/libavcodec/v408dec.c
@@ -79,12 +79,6 @@ static int v408_decode_frame(AVCodecContext *avctx, void *data,
return avpkt->size;
}
-static av_cold int v408_decode_close(AVCodecContext *avctx)
-{
-
- return 0;
-}
-
#if CONFIG_AYUV_DECODER
AVCodec ff_ayuv_decoder = {
.name = "ayuv",
@@ -92,7 +86,6 @@ AVCodec ff_ayuv_decoder = {
.id = AV_CODEC_ID_AYUV,
.init = v408_decode_init,
.decode = v408_decode_frame,
- .close = v408_decode_close,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"),
};
@@ -104,7 +97,6 @@ AVCodec ff_v408_decoder = {
.id = AV_CODEC_ID_V408,
.init = v408_decode_init,
.decode = v408_decode_frame,
- .close = v408_decode_close,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"),
};
diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
index 51f88a2..24fe550 100644
--- a/libavcodec/xbmdec.c
+++ b/libavcodec/xbmdec.c
@@ -27,6 +27,7 @@
static av_cold int xbm_decode_init(AVCodecContext *avctx)
{
+ avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
return 0;
}
@@ -73,8 +74,6 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
ptr += strcspn(ptr, "\n\r") + 1;
}
- avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
-
if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
return ret;
@@ -109,18 +108,11 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
return avpkt->size;
}
-static av_cold int xbm_decode_close(AVCodecContext *avctx)
-{
-
- return 0;
-}
-
AVCodec ff_xbm_decoder = {
.name = "xbm",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_XBM,
.init = xbm_decode_init,
- .close = xbm_decode_close,
.decode = xbm_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"),
diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c
index 42449c6..70b68aa 100644
--- a/libavcodec/y41pdec.c
+++ b/libavcodec/y41pdec.c
@@ -81,19 +81,12 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data,
return avpkt->size;
}
-static av_cold int y41p_decode_close(AVCodecContext *avctx)
-{
-
- return 0;
-}
-
AVCodec ff_y41p_decoder = {
.name = "y41p",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_Y41P,
.init = y41p_decode_init,
.decode = y41p_decode_frame,
- .close = y41p_decode_close,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"),
};
diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c
index 6965f39..1d1fdd0 100644
--- a/libavcodec/yuv4dec.c
+++ b/libavcodec/yuv4dec.c
@@ -73,19 +73,12 @@ static int yuv4_decode_frame(AVCodecContext *avctx, void *data,
return avpkt->size;
}
-static av_cold int yuv4_decode_close(AVCodecContext *avctx)
-{
-
- return 0;
-}
-
AVCodec ff_yuv4_decoder = {
.name = "yuv4",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_YUV4,
.init = yuv4_decode_init,
.decode = yuv4_decode_frame,
- .close = yuv4_decode_close,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"),
};
More information about the ffmpeg-cvslog
mailing list