scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 21:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to new GPUJPEG

Browse Source
This commit is contained in:
Martin Pulec
2019-10-07 18:29:43 +02:00
parent 9f507bfb3c
commit 7fcaa2d2ea
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gpujpeg

Submodule gpujpeg updated: 8a37dd1290...ec3043ef54

5
src/video_decompress/jpeg.c
View File

@@ -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 <pthread.h>
@@ -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, &params, NULL) != 0) {
#else
if (gpujpeg_decoder_get_image_info(buffer, len, &params) != 0) {
#endif
return DECODER_NO_FRAME;
}