[vlc-commits] avcodec: remove dummy EndSubtitleDec
Rafaël Carré
git at videolan.org
Tue Jun 4 20:05:19 CEST 2013
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon May 27 09:19:01 2013 +0200| [2a2e719d4ee49777ab352240158c5d27e53a0870] | committer: Rémi Denis-Courmont
avcodec: remove dummy EndSubtitleDec
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2a2e719d4ee49777ab352240158c5d27e53a0870
---
modules/codec/avcodec/avcodec.c | 3 ---
modules/codec/avcodec/avcodec.h | 1 -
modules/codec/avcodec/subtitle.c | 8 --------
3 files changed, 12 deletions(-)
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index b126d7a..aa807eb 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -355,9 +355,6 @@ static void CloseDecoder( vlc_object_t *p_this )
case VIDEO_ES:
EndVideoDec ( p_dec );
break;
- case SPU_ES:
- EndSubtitleDec( p_dec );
- break;
}
if( p_sys->p_context )
diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index c26978a..3887983 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -59,7 +59,6 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
/* Subtitle Decoder */
int InitSubtitleDec( decoder_t *p_dec, AVCodecContext *p_context,
AVCodec *p_codec, int i_codec_id, const char *psz_namecodec );
-void EndSubtitleDec( decoder_t *p_dec );
/* Initialize decoder */
int ffmpeg_OpenCodec( decoder_t *p_dec );
diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index a1543ef..324fd92 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -170,14 +170,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
}
/**
- * Clean up private data
- */
-void EndSubtitleDec(decoder_t *dec)
-{
- VLC_UNUSED(dec);
-}
-
-/**
* Convert a RGBA libavcodec region to our format.
*/
static subpicture_region_t *ConvertRegionRGBA(AVSubtitleRect *ffregion)
More information about the vlc-commits
mailing list