diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:00:42 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:06:19 +0300 |
| commit | 5f7887ca8d056d2debdd2c3b205ada7305d9ac07 (patch) | |
| tree | ceee289debe80e040b5d329484408495d488913f /libavcodec/vorbis_parser.h | |
| parent | a0617025dd264ba1db6a3dccfaed942ba0dd2bbe (diff) | |
| parent | 6896f95b2483e52e717e2c75a4fd24fcb0e14b67 (diff) | |
Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'
* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67':
vorbis_parser: add an AV prefix to VorbisParseContext
Conflicts:
libavcodec/vorbis_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis_parser.h')
| -rw-r--r-- | libavcodec/vorbis_parser.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h index aa7c1b0444..6e9a319e50 100644 --- a/libavcodec/vorbis_parser.h +++ b/libavcodec/vorbis_parser.h @@ -30,7 +30,7 @@ #include "avcodec.h" -typedef struct VorbisParseContext { +typedef struct AVVorbisParseContext { const AVClass *class; int extradata_parsed; ///< we have attempted to parse extradata int valid_extradata; ///< extradata is valid, so we can calculate duration @@ -40,7 +40,7 @@ typedef struct VorbisParseContext { int mode_count; ///< number of modes int mode_mask; ///< bitmask used to get the mode in each packet int prev_mask; ///< bitmask used to get the previous mode flag in each packet -} VorbisParseContext; +} AVVorbisParseContext; /** * Initialize the Vorbis parser using headers in the extradata. @@ -48,7 +48,7 @@ typedef struct VorbisParseContext { * @param avctx codec context * @param s Vorbis parser context */ -int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s); +int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s); #define VORBIS_FLAG_HEADER 0x00000001 #define VORBIS_FLAG_COMMENT 0x00000002 @@ -65,7 +65,7 @@ int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s); * @param buf_size size of the buffer * @param flags flags for special frames */ -int avpriv_vorbis_parse_frame_flags(VorbisParseContext *s, const uint8_t *buf, +int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf, int buf_size, int *flags); /** @@ -78,9 +78,9 @@ int avpriv_vorbis_parse_frame_flags(VorbisParseContext *s, const uint8_t *buf, * @param buf buffer containing a Vorbis frame * @param buf_size size of the buffer */ -int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf, +int avpriv_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf, int buf_size); -void avpriv_vorbis_parse_reset(VorbisParseContext *s); +void avpriv_vorbis_parse_reset(AVVorbisParseContext *s); #endif /* AVCODEC_VORBIS_PARSER_H */ |