Changeset 70496699780e834fc1da4e1327f891a1e0952e97
- Timestamp:
- 05/04/05 12:23:10
(4 years ago)
- Author:
- Gildas Bazin <gbazin@videolan.org>
- git-committer:
- Gildas Bazin <gbazin@videolan.org> 1112696590 +0000
- git-parent:
[fdccf31ce4cc98b6f9ef928513525fdb5a40f4ae]
- git-author:
- Gildas Bazin <gbazin@videolan.org> 1112696590 +0000
- Message:
* modules/demux/flac.c: fixed last commit.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r25c0339 |
r7049669 |
|
| 83 | 83 | module_Unneed( p_demux, p_id3 ); |
|---|
| 84 | 84 | } |
|---|
| 85 | | |
|---|
| | 85 | |
|---|
| 86 | 86 | /* Have a peep at the show. */ |
|---|
| 87 | 87 | if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) |
|---|
| … | … | |
| 151 | 151 | if( !p_sys->p_packetizer->p_module ) |
|---|
| 152 | 152 | { |
|---|
| 153 | | msg_Err( p_demux, "cannot find flac packetizer" ); |
|---|
| 154 | | goto error; |
|---|
| 155 | | } |
|---|
| 156 | | |
|---|
| 157 | | p_sys->p_es = es_out_Add( p_demux->out, &fmt ); |
|---|
| 158 | | |
|---|
| 159 | | return VLC_SUCCESS; |
|---|
| 160 | | |
|---|
| 161 | | error: |
|---|
| 162 | | if( p_sys != NULL && p_sys->p_packetizer ) |
|---|
| 163 | | { |
|---|
| 164 | 153 | if( p_sys->p_packetizer->fmt_in.p_extra ) |
|---|
| 165 | 154 | free( p_sys->p_packetizer->fmt_in.p_extra ); |
|---|
| 166 | 155 | vlc_object_destroy( p_sys->p_packetizer ); |
|---|
| 167 | | } |
|---|
| | 156 | |
|---|
| | 157 | msg_Err( p_demux, "cannot find flac packetizer" ); |
|---|
| | 158 | goto error; |
|---|
| | 159 | } |
|---|
| | 160 | |
|---|
| | 161 | p_sys->p_es = es_out_Add( p_demux->out, &fmt ); |
|---|
| | 162 | |
|---|
| | 163 | return VLC_SUCCESS; |
|---|
| | 164 | |
|---|
| | 165 | error: |
|---|
| 168 | 166 | if( p_meta ) |
|---|
| 169 | 167 | { |
|---|