diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-06 10:46:34 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-06 16:25:58 +0200 |
commit | 34e85cb340675ac9b67b72a34cc785bbc8863660 (patch) | |
tree | 315c023a24df5774932d53d5203a966c7b6ac9ff | |
parent | 2cad7eebc13f54d5526d8599d536aa8ffdaefe3b (diff) | |
download | ffmpeg-34e85cb340675ac9b67b72a34cc785bbc8863660.tar.gz |
avcodec/vorbis: remove avpriv vorbis parser cruft
It was replaced by a public API
-rw-r--r-- | libavcodec/vorbis_parser.c | 21 | ||||
-rw-r--r-- | libavcodec/vorbis_parser_internal.h | 40 |
2 files changed, 0 insertions, 61 deletions
diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index 8fa6d99588..0b2c97cde5 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -296,27 +296,6 @@ AVVorbisParseContext *av_vorbis_parse_init(const uint8_t *extradata, return s; } -#if LIBAVCODEC_VERSION_MAJOR < 57 -int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s) -{ - return vorbis_parse_init(s, avctx->extradata, avctx->extradata_size); -} -void avpriv_vorbis_parse_reset(AVVorbisParseContext *s) -{ - av_vorbis_parse_reset(s); -} -int avpriv_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf, - int buf_size) -{ - return av_vorbis_parse_frame(s, buf, buf_size); -} -int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf, - int buf_size, int *flags) -{ - return av_vorbis_parse_frame_flags(s, buf, buf_size, flags); -} -#endif - #if CONFIG_VORBIS_PARSER typedef struct VorbisParseContext { diff --git a/libavcodec/vorbis_parser_internal.h b/libavcodec/vorbis_parser_internal.h index 49481eeafd..98e48524a4 100644 --- a/libavcodec/vorbis_parser_internal.h +++ b/libavcodec/vorbis_parser_internal.h @@ -43,44 +43,4 @@ struct AVVorbisParseContext { int prev_mask; ///< bitmask used to get the previous mode flag in each packet }; -#if LIBAVCODEC_VERSION_MAJOR < 57 -/** - * Initialize the Vorbis parser using headers in the extradata. - * - * @param avctx codec context - * @param s Vorbis parser context - */ -int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s); - -/** - * Get the duration for a Vorbis packet. - * - * avpriv_vorbis_parse_extradata() must have been successfully called prior to - * this in order for a correct duration to be returned. If @p flags is @c NULL, - * special frames are considered invalid. - * - * @param s Vorbis parser context - * @param buf buffer containing a Vorbis frame - * @param buf_size size of the buffer - * @param flags flags for special frames - */ -int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf, - int buf_size, int *flags); - -/** - * Get the duration for a Vorbis packet. - * - * avpriv_vorbis_parse_extradata() must have been successfully called prior to - * this in order for a correct duration to be returned. - * - * @param s Vorbis parser context - * @param buf buffer containing a Vorbis frame - * @param buf_size size of the buffer - */ -int avpriv_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf, - int buf_size); - -void avpriv_vorbis_parse_reset(AVVorbisParseContext *s); -#endif - #endif /* AVCODEC_VORBIS_PARSER_H */ |