diff options
| author | wm4 <wm4@nowhere> | 2014-07-05 16:57:56 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-05 17:07:15 +0200 |
| commit | 338004bcfc224727d1477d303aa1521bf3ac21be (patch) | |
| tree | 5066a689bb13f4c00a360d9b33a485d81eb17d72 /player/video.c | |
| parent | 4d2a4afdef24c343b98e71dddcb3382e85c09c96 (diff) | |
| download | mpv-338004bcfc224727d1477d303aa1521bf3ac21be.tar.bz2 mpv-338004bcfc224727d1477d303aa1521bf3ac21be.tar.xz | |
dvd, bluray, cdda: add demux_disc containing all related hacks
DVD and Bluray (and to some extent cdda) require awful hacks all over
the codebase to make them work. The main reason is that they act like
container, but are entirely implemented on the stream layer. The raw
mpeg data resulting from these streams must be "extended" with the
container-like metadata transported via STREAM_CTRLs. The result were
hacks all over demux.c and some higher-level parts.
Add a "disc" pseudo-demuxer, and move all these hacks and special-cases
to it.
Diffstat (limited to 'player/video.c')
| -rw-r--r-- | player/video.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/player/video.c b/player/video.c index c7d5cd8ddb..3d742c0081 100644 --- a/player/video.c +++ b/player/video.c @@ -183,7 +183,6 @@ int reinit_video_chain(struct MPContext *mpctx) sh->video->disp_w, sh->video->disp_h, sh->video->fps); - double ar = -1.0; //================== Init VIDEO (codec & libvo) ========================== if (!opts->fixed_vo || !(mpctx->initialized_flags & INITIALIZED_VO)) { mpctx->video_out = init_best_video_out(mpctx->global, mpctx->input, @@ -212,10 +211,6 @@ int reinit_video_chain(struct MPContext *mpctx) vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, &d_video->hwdec_info); - if (stream_control(sh->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) - != STREAM_UNSUPPORTED) - d_video->stream_aspect = ar; - recreate_video_filters(mpctx); if (!video_init_best_codec(d_video, opts->video_decoders)) |