diff --git a/gpujpeg b/gpujpeg index 8a37dd129..ec3043ef5 160000 --- a/gpujpeg +++ b/gpujpeg @@ -1 +1 @@ -Subproject commit 8a37dd12903e752fcb07c2e0ce7f23a414881ccc +Subproject commit ec3043ef54492251afad78678ddc83c8f07b8763 diff --git a/src/video_decompress/jpeg.c b/src/video_decompress/jpeg.c index 7031a4ca4..9306ac7b3 100644 --- a/src/video_decompress/jpeg.c +++ b/src/video_decompress/jpeg.c @@ -46,6 +46,7 @@ #include "video_decompress.h" #include "libgpujpeg/gpujpeg_decoder.h" +#include "libgpujpeg/gpujpeg_reader.h" #include "libgpujpeg/gpujpeg_version.h" //#include "compat/platform_semaphore.h" #include @@ -149,7 +150,11 @@ static int jpeg_decompress_reconfigure(void *state, struct video_desc desc, #if LIBGPUJPEG_API_VERSION >= 4 static decompress_status jpeg_probe_internal_codec(unsigned char *buffer, size_t len, codec_t *internal_codec) { struct gpujpeg_image_parameters params = { 0 }; +#if LIBGPUJPEG_API_VERSION >= 5 + if (gpujpeg_reader_get_image_info(buffer, len, ¶ms, NULL) != 0) { +#else if (gpujpeg_decoder_get_image_info(buffer, len, ¶ms) != 0) { +#endif return DECODER_NO_FRAME; }