diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /libmpdemux/demux_nemesi.c | |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
| download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz | |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'libmpdemux/demux_nemesi.c')
| -rw-r--r-- | libmpdemux/demux_nemesi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index 800908b460..704f14cf81 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -224,6 +224,7 @@ static demuxer_t* demux_open_rtp(demuxer_t* demuxer) sh_audio_t* sh_audio = new_sh_audio(demuxer,0); WAVEFORMATEX* wf; demux_stream_t* d_audio = demuxer->audio; + demuxer->audio->id = 0; mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as AUDIO stream...\n"); |