diff options
| author | wm4 <wm4@nowhere> | 2015-07-02 14:08:22 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-02 14:08:22 +0200 |
| commit | a9bbaa5eb29cae310ca8efd4f8d197de406683f7 (patch) | |
| tree | 2f7c3551556b826f2e7be3646a9bd23cdc695160 | |
| parent | 899dfa957f23bc92c2fa54bda9b856435639fd8c (diff) | |
| download | mpv-a9bbaa5eb29cae310ca8efd4f8d197de406683f7.tar.bz2 mpv-a9bbaa5eb29cae310ca8efd4f8d197de406683f7.tar.xz | |
player: remove automatic DVB channel advancement on no data
For the sake of removing the separate stream/demuxer loading code.
This could probably be reimplemented in some other way, but I have no
DVB hardware for testing. The most preferred way would be making DVB to
not quit, and just rerun the stream selection.
| -rw-r--r-- | player/loadfile.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 976e729287..f4ba0d4282 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1195,12 +1195,6 @@ goto_reopen_demuxer: ; !mpctx->current_track[0][STREAM_AUDIO]) { MP_FATAL(mpctx, "No video or audio streams selected.\n"); - struct demuxer *d = mpctx->demuxer; - if (d->stream->uncached_type == STREAMTYPE_DVB) { - int dir = mpctx->last_dvb_step; - if (demux_stream_control(d, STREAM_CTRL_DVB_STEP_CHANNEL, &dir) > 0) - mpctx->stop_play = PT_RELOAD_DEMUXER; - } mpctx->error_playing = MPV_ERROR_NOTHING_TO_PLAY; goto terminate_playback; } |