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 /video/decode | |
| 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 'video/decode')
| -rw-r--r-- | video/decode/dec_video.c | 3 | ||||
| -rw-r--r-- | video/decode/dec_video.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index 807ce2013c..b7002800fb 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -408,9 +408,6 @@ int video_reconfig_filters(struct dec_video *d_video, } float force_aspect = opts->movie_aspect; - if (force_aspect > 0.0 && d_video->stream_aspect != 0.0) - force_aspect = d_video->stream_aspect; - if (force_aspect >= 0.0) vf_set_dar(&p.d_w, &p.d_h, p.w, p.h, force_aspect); diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index 9541cb3ca6..c9513ac3cd 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -72,7 +72,6 @@ struct dec_video { // Final PTS of previously decoded image double decoded_pts; - float stream_aspect; // aspect ratio in media headers (DVD IFO files) int bitrate; // compressed bits/sec float fps; // FPS from demuxer or from user override float initial_decoder_aspect; |