summaryrefslogtreecommitdiff
path: root/src/extractors
diff options
context:
space:
mode:
authorMole Shang <[email protected]>2023-08-08 11:08:37 +0800
committerMole Shang <[email protected]>2023-08-08 11:08:37 +0800
commitf0121e1596dc5490b58b6dad1bfb8f3b83d19b94 (patch)
tree97d23f03a6e607d2414bbc5390b926031fbe6537 /src/extractors
parentea686558ff9d0e4a9c4ca07c1a3e79d49e5847e4 (diff)
downloadhinata-f0121e1596dc5490b58b6dad1bfb8f3b83d19b94.tar.gz
hinata-f0121e1596dc5490b58b6dad1bfb8f3b83d19b94.tar.bz2
hinata-f0121e1596dc5490b58b6dad1bfb8f3b83d19b94.zip
process_url: do not block ui thread on callback
Diffstat (limited to 'src/extractors')
-rw-r--r--src/extractors/bilibili.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/extractors/bilibili.c b/src/extractors/bilibili.c
index 9d1ede6..f14432e 100644
--- a/src/extractors/bilibili.c
+++ b/src/extractors/bilibili.c
@@ -380,14 +380,15 @@ static void dash_cleanup(Dash *dash) {
free_array(&dash->dashinfo.dash.video);
}
-static int bilibili_merge(callback_struct_t *cb_struct) {
+static int bilibili_merge(void *v) {
+ callback_struct_t *cb_struct = (callback_struct_t *)v;
LOG("Bilibili", "Using ffmpeg to merge downloaded files ...\n");
- merge_av(cb_struct->videofn, cb_struct->audiofn, cb_struct->filename);
+ int r = merge_av(cb_struct->videofn, cb_struct->audiofn, cb_struct->filename);
free_and_nullify(cb_struct->videofn);
free_and_nullify(cb_struct->audiofn);
free_and_nullify(cb_struct->filename);
LOG("Bilibili", "All done!\n");
- return 0;
+ return r;
}
static int download(Bilibili_options *bilibili_options) {