Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
2a2e719d
Commit
2a2e719d
authored
May 27, 2013
by
Rafaël Carré
Committed by
Rémi Denis-Courmont
Jun 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: remove dummy EndSubtitleDec
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
a725a1cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
12 deletions
+0
-12
modules/codec/avcodec/avcodec.c
modules/codec/avcodec/avcodec.c
+0
-3
modules/codec/avcodec/avcodec.h
modules/codec/avcodec/avcodec.h
+0
-1
modules/codec/avcodec/subtitle.c
modules/codec/avcodec/subtitle.c
+0
-8
No files found.
modules/codec/avcodec/avcodec.c
View file @
2a2e719d
...
@@ -355,9 +355,6 @@ static void CloseDecoder( vlc_object_t *p_this )
...
@@ -355,9 +355,6 @@ static void CloseDecoder( vlc_object_t *p_this )
case
VIDEO_ES
:
case
VIDEO_ES
:
EndVideoDec
(
p_dec
);
EndVideoDec
(
p_dec
);
break
;
break
;
case
SPU_ES
:
EndSubtitleDec
(
p_dec
);
break
;
}
}
if
(
p_sys
->
p_context
)
if
(
p_sys
->
p_context
)
...
...
modules/codec/avcodec/avcodec.h
View file @
2a2e719d
...
@@ -59,7 +59,6 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
...
@@ -59,7 +59,6 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
/* Subtitle Decoder */
/* Subtitle Decoder */
int
InitSubtitleDec
(
decoder_t
*
p_dec
,
AVCodecContext
*
p_context
,
int
InitSubtitleDec
(
decoder_t
*
p_dec
,
AVCodecContext
*
p_context
,
AVCodec
*
p_codec
,
int
i_codec_id
,
const
char
*
psz_namecodec
);
AVCodec
*
p_codec
,
int
i_codec_id
,
const
char
*
psz_namecodec
);
void
EndSubtitleDec
(
decoder_t
*
p_dec
);
/* Initialize decoder */
/* Initialize decoder */
int
ffmpeg_OpenCodec
(
decoder_t
*
p_dec
);
int
ffmpeg_OpenCodec
(
decoder_t
*
p_dec
);
...
...
modules/codec/avcodec/subtitle.c
View file @
2a2e719d
...
@@ -169,14 +169,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
...
@@ -169,14 +169,6 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
return
spu
;
return
spu
;
}
}
/**
* Clean up private data
*/
void
EndSubtitleDec
(
decoder_t
*
dec
)
{
VLC_UNUSED
(
dec
);
}
/**
/**
* Convert a RGBA libavcodec region to our format.
* Convert a RGBA libavcodec region to our format.
*/
*/
...
...
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