diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 11:00:42 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 11:06:19 +0100 |
commit | 5f7887ca8d056d2debdd2c3b205ada7305d9ac07 (patch) | |
tree | ceee289debe80e040b5d329484408495d488913f /libavformat/oggparsevorbis.c | |
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 'libavformat/oggparsevorbis.c')
-rw-r--r-- | libavformat/oggparsevorbis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 5e34be5378..7ff64f3a3b 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -213,7 +213,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m, struct oggvorbis_private { unsigned int len[3]; unsigned char *packet[3]; - VorbisParseContext vp; + AVVorbisParseContext vp; int64_t final_pts; int final_duration; }; |