Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
7c4b1eb9
Commit
7c4b1eb9
authored
Aug 28, 2009
by
Jean-Baptiste Kempf
Browse files
Remove all subtitles support for people with old avcodec versions.
parent
152870ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/codec/avcodec/avcodec.c
View file @
7c4b1eb9
...
...
@@ -280,11 +280,13 @@ static int OpenDecoder( vlc_object_t *p_this )
i_result
=
InitAudioDec
(
p_dec
,
p_context
,
p_codec
,
i_codec_id
,
psz_namecodec
);
break
;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
case
SPU_ES
:
p_dec
->
pf_decode_sub
=
DecodeSubtitle
;
i_result
=
InitSubtitleDec
(
p_dec
,
p_context
,
p_codec
,
i_codec_id
,
psz_namecodec
);
break
;
#endif
default:
i_result
=
VLC_EGENERIC
;
}
...
...
modules/codec/avcodec/subtitle.c
View file @
7c4b1eb9
...
...
@@ -48,6 +48,8 @@
#include "avcodec.h"
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
struct
decoder_sys_t
{
FFMPEG_COMMON_MEMBERS
};
...
...
@@ -100,7 +102,6 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context,
*/
subpicture_t
*
DecodeSubtitle
(
decoder_t
*
dec
,
block_t
**
block_ptr
)
{
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
decoder_sys_t
*
sys
=
dec
->
p_sys
;
if
(
!
block_ptr
||
!*
block_ptr
)
...
...
@@ -164,11 +165,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
if
(
!
spu
)
block_Release
(
block
);
return
spu
;
#else
VLC_UNUSED
(
dec
);
VLC_UNUSED
(
block_ptr
);
return
NULL
;
#endif
}
/**
...
...
@@ -278,3 +274,4 @@ static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t
return
spu
;
}
#endif
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment