Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
db4d3a74
Commit
db4d3a74
authored
Feb 03, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: remove the FF_API_SUBTITLE_OLD cruft.
parent
e89e5afd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
26 deletions
+0
-26
libavcodec/avcodec.h
libavcodec/avcodec.h
+0
-9
libavcodec/utils.c
libavcodec/utils.c
+0
-14
libavcodec/version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/avcodec.h
View file @
db4d3a74
...
...
@@ -3785,15 +3785,6 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
int
*
got_picture_ptr
,
AVPacket
*
avpkt
);
#if FF_API_SUBTITLE_OLD
/* Decode a subtitle message. Return -1 if error, otherwise return the
* number of bytes used. If no subtitle could be decompressed,
* got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */
attribute_deprecated
int
avcodec_decode_subtitle
(
AVCodecContext
*
avctx
,
AVSubtitle
*
sub
,
int
*
got_sub_ptr
,
const
uint8_t
*
buf
,
int
buf_size
);
#endif
/**
* Decode a subtitle message.
* Return a negative value on error, otherwise return the number of bytes used.
...
...
libavcodec/utils.c
View file @
db4d3a74
...
...
@@ -692,20 +692,6 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
return
ret
;
}
#if FF_API_SUBTITLE_OLD
int
avcodec_decode_subtitle
(
AVCodecContext
*
avctx
,
AVSubtitle
*
sub
,
int
*
got_sub_ptr
,
const
uint8_t
*
buf
,
int
buf_size
)
{
AVPacket
avpkt
;
av_init_packet
(
&
avpkt
);
avpkt
.
data
=
buf
;
avpkt
.
size
=
buf_size
;
return
avcodec_decode_subtitle2
(
avctx
,
sub
,
got_sub_ptr
,
&
avpkt
);
}
#endif
int
avcodec_decode_subtitle2
(
AVCodecContext
*
avctx
,
AVSubtitle
*
sub
,
int
*
got_sub_ptr
,
AVPacket
*
avpkt
)
...
...
libavcodec/version.h
View file @
db4d3a74
...
...
@@ -41,9 +41,6 @@
#ifndef FF_API_PALETTE_CONTROL
#define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_SUBTITLE_OLD
#define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_USE_LPC
#define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53)
#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