| commit | a7b91626cf04139b3a42db048fe5b5aea96e141a | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Mon, 8 Nov 2010 00:38:51 +0000 (8 02:38 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Mon, 8 Nov 2010 16:05:12 +0000 (8 18:05 +0200) | ||
| tree | 66c48a2ffe943c260ca62e3f9b39481fda97cac0 | treesnapshot (tar.gz zip) |
| parent | 82cd2f7aecef6594f1aea15251b547365bebb183 | commitdiff |
core: use correct demuxer with -audiofile / -subfile
Various code referred to "mpctx->demuxer" where it should really have
referred to the one used for audio/subtitles in case those differ. Fix
by using "mpctx->d_audio->demuxer" etc instead. Disable the copying of
streams in demux_demuxers; that was a partial workaround for things
referring to the main demuxer (and it wasn't enough anyway).
This fixes, among other things, switching audio tracks within the file
specified by -audiofile.
Various code referred to "mpctx->demuxer" where it should really have
referred to the one used for audio/subtitles in case those differ. Fix
by using "mpctx->d_audio->demuxer" etc instead. Disable the copying of
streams in demux_demuxers; that was a partial workaround for things
referring to the main demuxer (and it wasn't enough anyway).
This fixes, among other things, switching audio tracks within the file
specified by -audiofile.
| command.c | diffblobblamehistory | |
| libmpdemux/demux_demuxers.c | diffblobblamehistory | |
| mplayer.c | diffblobblamehistory |