diff options
Diffstat (limited to 'plugins/liboggedit/oggedit_flac.c')
| -rw-r--r-- | plugins/liboggedit/oggedit_flac.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/plugins/liboggedit/oggedit_flac.c b/plugins/liboggedit/oggedit_flac.c index fd3a71a6..b60a1d5a 100644 --- a/plugins/liboggedit/oggedit_flac.c +++ b/plugins/liboggedit/oggedit_flac.c @@ -30,14 +30,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <stdbool.h> -#include <ogg/ogg.h> -#if HAVE_SYS_SYSLIMITS_H -#include <sys/syslimits.h> -#endif -#include "../../deadbeef.h" #include "oggedit_internal.h" -#include "oggedit.h" #define PADTYPE 0x01 #define VCTYPE 0x04 @@ -99,11 +92,15 @@ static ogg_packet **metadata_block_packets(DB_FILE *in, ogg_sync_state *oy, cons } *vendor = parse_vendor(headers[0], 4); +#ifdef HAVE_OGG_STREAM_FLUSH_FILL size_t bytes = 0; for (size_t i = 0; i < packets; i++) bytes += headers[i]->bytes; if (bytes < MAXPAYLOAD * (pages-1)) headers[0]->bytes = 4; +#else + headers[0]->bytes = 4; // not safe to pad without ogg_stream_flush_fill +#endif *res = OGGEDIT_OK; return headers; @@ -161,7 +158,7 @@ off_t oggedit_write_flac_metadata(DB_FILE *in, const char *fname, const off_t of const off_t stream_size_k = in->vfs->getlength(in) / 1000; // use file size for now const size_t metadata_size = 4 + vc_size(vendor, num_tags, tags); ptrdiff_t padding = headers[0]->bytes - metadata_size; - if (stream_size_k < 1000 || padding < 0 || (headers[1] && padding > 0) || padding > stream_size_k+metadata_size) { + if (stream_size_k < 1000 || padding < 0 || headers[1] && padding > 0 || padding > stream_size_k+metadata_size) { res = open_temp_file(fname, tempname, &out); if (res) { goto cleanup; |