ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Sep 6 10:46:34 2015 +0200| [34e85cb340675ac9b67b72a34cc785bbc8863660] | committer: Hendrik Leppkes
avcodec/vorbis: remove avpriv vorbis parser cruft It was replaced by a public API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34e85cb340675ac9b67b72a34cc785bbc8863660 --- libavcodec/vorbis_parser.c | 21 ------------------ libavcodec/vorbis_parser_internal.h | 40 ----------------------------------- 2 files changed, 61 deletions(-) diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index 8fa6d99..0b2c97c 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 49481ee..98e4852 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 */ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
