diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 11:21:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 11:21:47 +0100 |
| commit | 44fa2671e0db0bb1a92c365fb3c9c2d1cd7199ca (patch) | |
| tree | 3eede210817e4cd60b1a868cfc74ccf6955495a7 /libavformat/oggparsevorbis.c | |
| parent | 5f7887ca8d056d2debdd2c3b205ada7305d9ac07 (diff) | |
| parent | 5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70 (diff) | |
Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'
* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
lavc: add a public API for parsing vorbis packets.
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/version.h
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 7ff64f3a3b..7efa660976 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -30,7 +30,7 @@ #include "libavutil/dict.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" -#include "libavcodec/vorbis_parser.h" +#include "libavcodec/vorbis_parser_internal.h" #include "avformat.h" #include "flac_picture.h" #include "internal.h" |