Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
7c4b1eb9
Commit
7c4b1eb9
authored
Aug 28, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove all subtitles support for people with old avcodec versions.
parent
152870ac
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
modules/codec/avcodec/avcodec.c
modules/codec/avcodec/avcodec.c
+2
-0
modules/codec/avcodec/subtitle.c
modules/codec/avcodec/subtitle.c
+3
-6
No files found.
modules/codec/avcodec/avcodec.c
View file @
7c4b1eb9
...
@@ -280,11 +280,13 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -280,11 +280,13 @@ static int OpenDecoder( vlc_object_t *p_this )
i_result
=
InitAudioDec
(
p_dec
,
p_context
,
p_codec
,
i_result
=
InitAudioDec
(
p_dec
,
p_context
,
p_codec
,
i_codec_id
,
psz_namecodec
);
i_codec_id
,
psz_namecodec
);
break
;
break
;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
case
SPU_ES
:
case
SPU_ES
:
p_dec
->
pf_decode_sub
=
DecodeSubtitle
;
p_dec
->
pf_decode_sub
=
DecodeSubtitle
;
i_result
=
InitSubtitleDec
(
p_dec
,
p_context
,
p_codec
,
i_result
=
InitSubtitleDec
(
p_dec
,
p_context
,
p_codec
,
i_codec_id
,
psz_namecodec
);
i_codec_id
,
psz_namecodec
);
break
;
break
;
#endif
default:
default:
i_result
=
VLC_EGENERIC
;
i_result
=
VLC_EGENERIC
;
}
}
...
...
modules/codec/avcodec/subtitle.c
View file @
7c4b1eb9
...
@@ -48,6 +48,8 @@
...
@@ -48,6 +48,8 @@
#include "avcodec.h"
#include "avcodec.h"
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
struct
decoder_sys_t
{
struct
decoder_sys_t
{
FFMPEG_COMMON_MEMBERS
FFMPEG_COMMON_MEMBERS
};
};
...
@@ -100,7 +102,6 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context,
...
@@ -100,7 +102,6 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context,
*/
*/
subpicture_t
*
DecodeSubtitle
(
decoder_t
*
dec
,
block_t
**
block_ptr
)
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
;
decoder_sys_t
*
sys
=
dec
->
p_sys
;
if
(
!
block_ptr
||
!*
block_ptr
)
if
(
!
block_ptr
||
!*
block_ptr
)
...
@@ -164,11 +165,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
...
@@ -164,11 +165,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
if
(
!
spu
)
if
(
!
spu
)
block_Release
(
block
);
block_Release
(
block
);
return
spu
;
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
...
@@ -278,3 +274,4 @@ static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t
return
spu
;
return
spu
;
}
}
#endif
Write
Preview
Markdown
is supported
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