summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-11-16 23:21:03 +0100
committerwm4 <wm4@nowhere>2019-11-17 02:11:45 +0100
commitba6ba3282534a7606cadd73f25133cd7b106aecc (patch)
tree4b8a0fabf64e7a164dcb5e5a80a96783aba09bc9
parentba370e95992177625fa8f804d0bda55d09f1a43b (diff)
downloadmpv-ba6ba3282534a7606cadd73f25133cd7b106aecc.tar.bz2
mpv-ba6ba3282534a7606cadd73f25133cd7b106aecc.tar.xz
f_decoder_wrapper: put coverart through image output logic
This wasn't done, probably regression from one of the last dozen of times this special code path was touched. This meant coverart images ignored the user-set aspect ratio completely, and some other things.
-rw-r--r--filters/f_decoder_wrapper.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/filters/f_decoder_wrapper.c b/filters/f_decoder_wrapper.c
index 0462bf2424..9654af3ac9 100644
--- a/filters/f_decoder_wrapper.c
+++ b/filters/f_decoder_wrapper.c
@@ -661,11 +661,13 @@ static void read_frame(struct priv *p)
if (p->decoded_coverart.type) {
if (p->coverart_returned == 0) {
- mp_pin_in_write(pin, mp_frame_ref(p->decoded_coverart));
+ frame = mp_frame_ref(p->decoded_coverart);
p->coverart_returned = 1;
+ goto output_frame;
} else if (p->coverart_returned == 1) {
- mp_pin_in_write(pin, MP_EOF_FRAME);
+ frame = MP_EOF_FRAME;
p->coverart_returned = 2;
+ goto output_frame;
}
return;
}