X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggdec.h;h=184a628622c39eb9d4beb51b5fedf1d5f5cca50e;hb=85e5b866dca776ba259113604c56136c2c8531b3;hp=2f3a6f3d072c9242f9cdf20a097b2664c333a403;hpb=b53cde48bdc807fe5126eee7dc116812c6607974;p=ffmpeg diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 2f3a6f3d072..184a628622c 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -62,7 +62,6 @@ struct ogg_stream { unsigned int pflags; unsigned int pduration; uint32_t serial; - uint32_t seq; uint64_t granule; int64_t lastpts; int64_t lastdts; @@ -92,7 +91,6 @@ struct ogg { int nstreams; int headers; int curidx; - uint64_t size; struct ogg_state *state; }; @@ -100,6 +98,7 @@ struct ogg { #define OGG_FLAG_BOS 2 #define OGG_FLAG_EOS 4 +extern const struct ogg_codec ff_celt_codec; extern const struct ogg_codec ff_dirac_codec; extern const struct ogg_codec ff_flac_codec; extern const struct ogg_codec ff_ogm_audio_codec; @@ -113,9 +112,7 @@ extern const struct ogg_codec ff_speex_codec; extern const struct ogg_codec ff_theora_codec; extern const struct ogg_codec ff_vorbis_codec; -extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; - -int ff_vorbis_comment(AVFormatContext *ms, AVMetadata **m, uint8_t *buf, int size); +int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, const uint8_t *buf, int size); static inline int ogg_find_stream (struct ogg * ogg, int serial)