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
e89e5afd
Commit
e89e5afd
authored
Feb 03, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: remove the FF_API_VIDEO_OLD cruft.
parent
9b4f1cdb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
38 deletions
+0
-38
libavcodec/avcodec.h
libavcodec/avcodec.h
+0
-19
libavcodec/utils.c
libavcodec/utils.c
+0
-16
libavcodec/version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/avcodec.h
View file @
e89e5afd
...
...
@@ -3741,25 +3741,6 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
int
*
frame_size_ptr
,
AVPacket
*
avpkt
);
#if FF_API_VIDEO_OLD
/**
* Decode a video frame from buf into picture.
* Wrapper function which calls avcodec_decode_video2.
*
* @deprecated Use avcodec_decode_video2 instead.
* @param avctx the codec context
* @param[out] picture The AVFrame in which the decoded video frame will be stored.
* @param[in] buf the input buffer
* @param[in] buf_size the size of the input buffer in bytes
* @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
* @return On error a negative value is returned, otherwise the number of bytes
* used or zero if no frame could be decompressed.
*/
attribute_deprecated
int
avcodec_decode_video
(
AVCodecContext
*
avctx
,
AVFrame
*
picture
,
int
*
got_picture_ptr
,
const
uint8_t
*
buf
,
int
buf_size
);
#endif
/**
* Decode the video frame of size avpkt->size from avpkt->data into picture.
* Some decoders may support multiple frames in a single AVPacket, such
...
...
libavcodec/utils.c
View file @
e89e5afd
...
...
@@ -631,22 +631,6 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
return
ret
;
}
#if FF_API_VIDEO_OLD
int
attribute_align_arg
avcodec_decode_video
(
AVCodecContext
*
avctx
,
AVFrame
*
picture
,
int
*
got_picture_ptr
,
const
uint8_t
*
buf
,
int
buf_size
)
{
AVPacket
avpkt
;
av_init_packet
(
&
avpkt
);
avpkt
.
data
=
buf
;
avpkt
.
size
=
buf_size
;
// HACK for CorePNG to decode as normal PNG by default
avpkt
.
flags
=
AV_PKT_FLAG_KEY
;
return
avcodec_decode_video2
(
avctx
,
picture
,
got_picture_ptr
,
&
avpkt
);
}
#endif
int
attribute_align_arg
avcodec_decode_video2
(
AVCodecContext
*
avctx
,
AVFrame
*
picture
,
int
*
got_picture_ptr
,
AVPacket
*
avpkt
)
...
...
libavcodec/version.h
View file @
e89e5afd
...
...
@@ -41,9 +41,6 @@
#ifndef FF_API_PALETTE_CONTROL
#define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_VIDEO_OLD
#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_SUBTITLE_OLD
#define FF_API_SUBTITLE_OLD (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