[vlc-commits] Avformat: do not add attachment as ES
Jean-Baptiste Kempf
git at videolan.org
Sun May 15 17:58:39 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun May 15 15:41:49 2011 +0200| [5d8f9a37f7bb60ea90594ad3567266eebd609a68] | committer: Jean-Baptiste Kempf
Avformat: do not add attachment as ES
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d8f9a37f7bb60ea90594ad3567266eebd609a68
---
modules/demux/avformat/demux.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index fb3c8cb..b09cf50 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -450,15 +450,15 @@ int OpenDemux( vlc_object_t *p_this )
memcpy( fmt.p_extra, p_extra, i_extra );
}
}
+ es = es_out_Add( p_demux->out, &fmt );
+ if( s->disposition & AV_DISPOSITION_DEFAULT )
+ es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
+ es_format_Clean( &fmt );
+
+ msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
+ psz_type, (char*)&fcc );
+ TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
}
- es = es_out_Add( p_demux->out, &fmt );
- if( s->disposition & AV_DISPOSITION_DEFAULT )
- es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
- es_format_Clean( &fmt );
-
- msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
- psz_type, (char*)&fcc );
- TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
}
if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
i_start_time = p_sys->ic->start_time * 1000000 / AV_TIME_BASE;
More information about the vlc-commits
mailing list