remove some empty close/init functions in avcodec

patch by Alex

Originally committed as revision 11093 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 17 years ago
parent 725d86bfd5
commit 28e7453c11
  1. 13
      libavcodec/dvbsub.c
  2. 14
      libavcodec/dvdsubdec.c
  3. 13
      libavcodec/dvdsubenc.c
  4. 9
      libavcodec/wavpack.c

@ -390,16 +390,6 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s,
return q - outbuf; 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, static int dvbsub_encode(AVCodecContext *avctx,
unsigned char *buf, int buf_size, void *data) unsigned char *buf, int buf_size, void *data)
{ {
@ -416,7 +406,6 @@ AVCodec dvbsub_encoder = {
CODEC_TYPE_SUBTITLE, CODEC_TYPE_SUBTITLE,
CODEC_ID_DVB_SUBTITLE, CODEC_ID_DVB_SUBTITLE,
sizeof(DVBSubtitleContext), sizeof(DVBSubtitleContext),
dvbsub_init_decoder, NULL,
dvbsub_encode, dvbsub_encode,
dvbsub_close_decoder,
}; };

@ -42,11 +42,6 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *
} }
} }
static int dvdsub_init_decoder(AVCodecContext *avctx)
{
return 0;
}
static int decode_run_2bit(GetBitContext *gb, int *color) static int decode_run_2bit(GetBitContext *gb, int *color)
{ {
unsigned int v, t; unsigned int v, t;
@ -443,11 +438,6 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s)
return 1; return 1;
} }
static int dvdsub_close_decoder(AVCodecContext *avctx)
{
return 0;
}
#ifdef DEBUG #ifdef DEBUG
#undef fprintf #undef fprintf
static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h, 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_TYPE_SUBTITLE,
CODEC_ID_DVD_SUBTITLE, CODEC_ID_DVD_SUBTITLE,
0, 0,
dvdsub_init_decoder,
NULL, NULL,
dvdsub_close_decoder, NULL,
NULL,
dvdsub_decode, dvdsub_decode,
}; };

@ -204,16 +204,6 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
return q - outbuf; 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, static int dvdsub_encode(AVCodecContext *avctx,
unsigned char *buf, int buf_size, void *data) unsigned char *buf, int buf_size, void *data)
{ {
@ -230,7 +220,6 @@ AVCodec dvdsub_encoder = {
CODEC_TYPE_SUBTITLE, CODEC_TYPE_SUBTITLE,
CODEC_ID_DVD_SUBTITLE, CODEC_ID_DVD_SUBTITLE,
0, 0,
dvdsub_init_encoder, NULL,
dvdsub_encode, dvdsub_encode,
dvdsub_close_encoder,
}; };

@ -364,13 +364,6 @@ static int wavpack_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int wavpack_decode_close(AVCodecContext *avctx)
{
// WavpackContext *s = avctx->priv_data;
return 0;
}
static int wavpack_decode_frame(AVCodecContext *avctx, static int wavpack_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) uint8_t *buf, int buf_size)
@ -587,6 +580,6 @@ AVCodec wavpack_decoder = {
sizeof(WavpackContext), sizeof(WavpackContext),
wavpack_decode_init, wavpack_decode_init,
NULL, NULL,
wavpack_decode_close, NULL,
wavpack_decode_frame, wavpack_decode_frame,
}; };

Loading…
Cancel
Save