diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 10:50:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 10:50:59 +0100 |
| commit | a0617025dd264ba1db6a3dccfaed942ba0dd2bbe (patch) | |
| tree | 9dac7508bd98a841a4f491d68318cb1d3b5a4588 /libavcodec/vorbis_parser.h | |
| parent | 817663897e59f45f60016fa9d3d16e325b803967 (diff) | |
| parent | 874792641ea4d52e0e03835da630565e63cc1d1f (diff) | |
| download | ffmpeg-a0617025dd264ba1db6a3dccfaed942ba0dd2bbe.tar.gz | |
Merge commit '8747926'
* commit '8747926':
vorbis_parser: use a dedicated AVClass for logging
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h index 590101bbad..aa7c1b0444 100644 --- a/libavcodec/vorbis_parser.h +++ b/libavcodec/vorbis_parser.h @@ -31,7 +31,7 @@ #include "avcodec.h" typedef struct VorbisParseContext { - AVCodecContext *avctx; ///< codec context + const AVClass *class; int extradata_parsed; ///< we have attempted to parse extradata int valid_extradata; ///< extradata is valid, so we can calculate duration int blocksize[2]; ///< short and long window sizes |