generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vorbis: parse out setup headers as well

Browse Source 
Prevents an 'Invalid packet' message. Currently mid-stream setup packets
are ignored. Theoretically, they could, based on the specification, be used to
reinitialize the stream if parameters change, but I don't expect that to be
common (and no one seems to have asked for it).

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ben Boeckel 2015-02-01 20:00:02 -05:00 committed by Michael Niedermayer
parent 17d87571c8
commit 1fe94ea79e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vorbis_parser.c
View File

@ -229,6 +229,8 @@ int av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
*flags |= VORBIS_FLAG_HEADER; *flags |= VORBIS_FLAG_HEADER;
else if (buf[0] == 3) else if (buf[0] == 3)
*flags |= VORBIS_FLAG_COMMENT; *flags |= VORBIS_FLAG_COMMENT;
else if (buf[0] == 5)
*flags |= VORBIS_FLAG_SETUP;
else else
goto bad_packet; goto bad_packet;

1
libavcodec/vorbis_parser.h
View File

@ -47,6 +47,7 @@ void av_vorbis_parse_free(AVVorbisParseContext **s);
#define VORBIS_FLAG_HEADER 0x00000001 #define VORBIS_FLAG_HEADER 0x00000001
#define VORBIS_FLAG_COMMENT 0x00000002 #define VORBIS_FLAG_COMMENT 0x00000002
#define VORBIS_FLAG_SETUP 0x00000004
/** /**
* Get the duration for a Vorbis packet. * Get the duration for a Vorbis packet.