virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'

Browse Source 
* commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8':
  ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-14 00:04:42 +02:00
parent a90364d001 db68ef898a
commit a8db787932
9 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/oggdec.h
View File

@@ -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)
{