Skip to content

V
vlc-2-2
Commit 49e9d64f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed theora/speex workaround (avformat).

parent aad46ccd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/demux/avformat/demux.c
View file @ 49e9d64f
...@@ -342,10 +342,11 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -342,10 +342,11 @@ int OpenDemux( vlc_object_t *p_this )
if( cc->codec_type != CODEC_TYPE_ATTACHMENT ) if( cc->codec_type != CODEC_TYPE_ATTACHMENT )
#endif #endif
{ {
const bool b_ogg = !strcmp( p_sys->fmt->name, "ogg" );
const uint8_t *p_extra = cc->extradata; const uint8_t *p_extra = cc->extradata;
unsigned i_extra = cc->extradata_size; unsigned i_extra = cc->extradata_size;
if( cc->codec_id == CODEC_ID_THEORA ) if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
{ {
unsigned pi_size[3]; unsigned pi_size[3];
void *pp_data[3]; void *pp_data[3];
...@@ -369,7 +370,7 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -369,7 +370,7 @@ int OpenDemux( vlc_object_t *p_this )
fmt.p_extra = NULL; fmt.p_extra = NULL;
} }
} }
else if( cc->codec_id == CODEC_ID_SPEEX ) else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
{ {
uint8_t p_dummy_comment[] = { uint8_t p_dummy_comment[] = {
0, 0, 0, 0, 0, 0, 0, 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment