summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-15 20:28:36 +0100
committerwm4 <wm4@nowhere>2016-02-15 20:28:36 +0100
commitf219a48dca7dbd525c1611b1d579947a3dd9b82b (patch)
tree439243a300ac0e162f4b8ccf063f53f343c5bdee /video
parent8aeaa34a5c9206392a23b1017a47df2c968c43fe (diff)
downloadmpv-f219a48dca7dbd525c1611b1d579947a3dd9b82b.tar.bz2
mpv-f219a48dca7dbd525c1611b1d579947a3dd9b82b.tar.xz
video: remove pointless parameter indirection
This is always the same value.
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c6
-rw-r--r--video/decode/dec_video.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 2b01b544cc..05de748e69 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -126,15 +126,17 @@ static const struct vd_functions *find_driver(const char *name)
return NULL;
}
-bool video_init_best_codec(struct dec_video *d_video, char* video_decoders)
+bool video_init_best_codec(struct dec_video *d_video)
{
+ struct MPOpts *opts = d_video->opts;
+
assert(!d_video->vd_driver);
video_reset(d_video);
d_video->has_broken_packet_pts = -10; // needs 10 packets to reach decision
struct mp_decoder_entry *decoder = NULL;
struct mp_decoder_list *list =
- mp_select_video_decoders(d_video->header->codec->codec, video_decoders);
+ mp_select_video_decoders(d_video->header->codec->codec, opts->video_decoders);
mp_print_decoders(d_video->log, MSGL_V, "Codec list:", list);
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index dd2a39b2d2..9d69e0c73b 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -76,7 +76,7 @@ struct dec_video {
struct mp_decoder_list *video_decoder_list(void);
-bool video_init_best_codec(struct dec_video *d_video, char* video_decoders);
+bool video_init_best_codec(struct dec_video *d_video);
void video_uninit(struct dec_video *d_video);
void video_work(struct dec_video *d_video);