diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:04:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:05:49 +0200 |
| commit | a8db787932ad71ac4f77b61357b695c3b35a283d (patch) | |
| tree | e629c6cefe3230012fdbcf145f522b13b1fcc367 /libavformat/oggdec.h | |
| parent | a90364d001eb8289e1c423bf9884bb0affc3f662 (diff) | |
| parent | db68ef898a3802e51b6f41fd600d0d46d058e3f8 (diff) | |
| download | ffmpeg-a8db787932ad71ac4f77b61357b695c3b35a283d.tar.gz | |
Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'
* commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8':
ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.h')
| -rw-r--r-- | libavformat/oggdec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 22647e131f..7dc7716036 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -132,6 +132,9 @@ extern const struct ogg_codec ff_vp8_codec; int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, const uint8_t *buf, int size, int parse_picture); +int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, + const uint8_t *buf, int size); + static inline int ogg_find_stream (struct ogg * ogg, int serial) { |