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 /libavcodec/libvorbisenc.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 'libavcodec/libvorbisenc.c')
| -rw-r--r-- | libavcodec/libvorbisenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index 96af53614b..0feb6813b8 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -49,7 +49,7 @@ typedef struct LibvorbisEncContext { int dsp_initialized; /**< vd has been initialized */ vorbis_comment vc; /**< VorbisComment info */ double iblock; /**< impulse block bias option */ - VorbisParseContext vp; /**< parse context to get durations */ + AVVorbisParseContext vp; /**< parse context to get durations */ AudioFrameQueue afq; /**< frame queue for timestamps */ } LibvorbisEncContext; |