MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add misc.h include to artwork and correct safe_atoi32 call

Browse Source
This commit is contained in:
ejurgensen 2014-01-11 23:34:03 +01:00
parent eac404fa3a
commit 2d4de9dd75
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/artwork.c
View File

@ -36,6 +36,7 @@
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#include "db.h" #include "db.h"
#include "misc.h"
#include "logger.h" #include "logger.h"
#include "conffile.h" #include "conffile.h"
@ -1079,8 +1080,7 @@ artwork_get_group(int id, int max_w, int max_h, int format, struct evbuffer *evb
while (!got_art && ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id)) while (!got_art && ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
{ {
#if LIBAVFORMAT_VERSION_MAJOR >= 55 || (LIBAVFORMAT_VERSION_MAJOR == 54 && LIBAVFORMAT_VERSION_MINOR >= 20) #if LIBAVFORMAT_VERSION_MAJOR >= 55 || (LIBAVFORMAT_VERSION_MAJOR == 54 && LIBAVFORMAT_VERSION_MINOR >= 20)
safeatoi32(&dbmfi->artwork, &artwork_t); if ((safe_atoi32(dbmfi.artwork, &artwork_t) == 0) && (artwork_t == ARTWORK_EMBEDDED))
if (artwork_t == ARTWORK_EMBEDDED)
got_art = (artwork_get_embedded_image(dbmfi.path, max_w, max_h, format, evbuf) > 0); got_art = (artwork_get_embedded_image(dbmfi.path, max_w, max_h, format, evbuf) > 0);
else else
got_art = (artwork_get_own_image(dbmfi.path, max_w, max_h, format, evbuf) > 0); got_art = (artwork_get_own_image(dbmfi.path, max_w, max_h, format, evbuf) > 0);