[FFmpeg-cvslog] r11093 - in trunk/libavcodec: dvbsub.c dvdsubdec.c dvdsubenc.c wavpack.c

[aurel]

Author: aurel
Date: Sun Nov 25 18:31:55 2007
New Revision: 11093

Log:
remove some empty close/init functions in avcodec
patch by Alex


Modified:
   trunk/libavcodec/dvbsub.c
   trunk/libavcodec/dvdsubdec.c
   trunk/libavcodec/dvdsubenc.c
   trunk/libavcodec/wavpack.c

Modified: trunk/libavcodec/dvbsub.c
==============================================================================
--- trunk/libavcodec/dvbsub.c	(original)
+++ trunk/libavcodec/dvbsub.c	Sun Nov 25 18:31:55 2007
@@ -390,16 +390,6 @@ static int encode_dvb_subtitles(DVBSubti
     return q - outbuf;
 }
 
-static int dvbsub_init_decoder(AVCodecContext *avctx)
-{
-    return 0;
-}
-
-static int dvbsub_close_decoder(AVCodecContext *avctx)
-{
-    return 0;
-}
-
 static int dvbsub_encode(AVCodecContext *avctx,
                        unsigned char *buf, int buf_size, void *data)
 {
@@ -416,7 +406,6 @@ AVCodec dvbsub_encoder = {
     CODEC_TYPE_SUBTITLE,
     CODEC_ID_DVB_SUBTITLE,
     sizeof(DVBSubtitleContext),
-    dvbsub_init_decoder,
+    NULL,
     dvbsub_encode,
-    dvbsub_close_decoder,
 };

Modified: trunk/libavcodec/dvdsubdec.c
==============================================================================
--- trunk/libavcodec/dvdsubdec.c	(original)
+++ trunk/libavcodec/dvdsubdec.c	Sun Nov 25 18:31:55 2007
@@ -42,11 +42,6 @@ static void yuv_a_to_rgba(const uint8_t 
     }
 }
 
-static int dvdsub_init_decoder(AVCodecContext *avctx)
-{
-    return 0;
-}
-
 static int decode_run_2bit(GetBitContext *gb, int *color)
 {
     unsigned int v, t;
@@ -443,11 +438,6 @@ static int find_smallest_bounding_rectan
     return 1;
 }
 
-static int dvdsub_close_decoder(AVCodecContext *avctx)
-{
-    return 0;
-}
-
 #ifdef DEBUG
 #undef fprintf
 static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
@@ -512,8 +502,8 @@ AVCodec dvdsub_decoder = {
     CODEC_TYPE_SUBTITLE,
     CODEC_ID_DVD_SUBTITLE,
     0,
-    dvdsub_init_decoder,
     NULL,
-    dvdsub_close_decoder,
+    NULL,
+    NULL,
     dvdsub_decode,
 };

Modified: trunk/libavcodec/dvdsubenc.c
==============================================================================
--- trunk/libavcodec/dvdsubenc.c	(original)
+++ trunk/libavcodec/dvdsubenc.c	Sun Nov 25 18:31:55 2007
@@ -204,16 +204,6 @@ static int encode_dvd_subtitles(uint8_t 
     return q - outbuf;
 }
 
-static int dvdsub_init_encoder(AVCodecContext *avctx)
-{
-    return 0;
-}
-
-static int dvdsub_close_encoder(AVCodecContext *avctx)
-{
-    return 0;
-}
-
 static int dvdsub_encode(AVCodecContext *avctx,
                          unsigned char *buf, int buf_size, void *data)
 {
@@ -230,7 +220,6 @@ AVCodec dvdsub_encoder = {
     CODEC_TYPE_SUBTITLE,
     CODEC_ID_DVD_SUBTITLE,
     0,
-    dvdsub_init_encoder,
+    NULL,
     dvdsub_encode,
-    dvdsub_close_encoder,
 };

Modified: trunk/libavcodec/wavpack.c
==============================================================================
--- trunk/libavcodec/wavpack.c	(original)
+++ trunk/libavcodec/wavpack.c	Sun Nov 25 18:31:55 2007
@@ -364,13 +364,6 @@ static int wavpack_decode_init(AVCodecCo
     return 0;
 }
 
-static int wavpack_decode_close(AVCodecContext *avctx)
-{
-//    WavpackContext *s = avctx->priv_data;
-
-    return 0;
-}
-
 static int wavpack_decode_frame(AVCodecContext *avctx,
                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
@@ -587,6 +580,6 @@ AVCodec wavpack_decoder = {
     sizeof(WavpackContext),
     wavpack_decode_init,
     NULL,
-    wavpack_decode_close,
+    NULL,
     wavpack_decode_frame,
 };