RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_libvmaf: fix pre convert to framesync2 bugs 

Hi, it fixes the errors while converting to framesync2.
libvmaf was changed recently, double *score variable is removed in the new
version since it's not used anywhere. This patch fixes all the warnings and
segmentation faults.

Signed-off-by: Ashish Singh <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Ashish Singh 2017-08-03 11:04:01 +05:30 committed by Ronald S. Bultje
parent 2b9fd15734
commit 2a4a26fa4f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_libvmaf.c
View File

@ -24,7 +24,6 @@
* Calculate the VMAF between two input videos.
*/
#include <inttypes.h>
#include <pthread.h>
#include <libvmaf.h>
#include "libavutil/avstring.h"
@ -84,11 +83,10 @@ static const AVOption libvmaf_options[] = {
FRAMESYNC_DEFINE_CLASS(libvmaf, LIBVMAFContext, fs);
#define read_frame_fn(type, bits) \
static int read_frame_##bits##bit(float *ref_data, float *main_data, \
float *temp_data, int stride, \
double *score, void *ctx) \
static int read_frame_##bits##bit(float *ref_data, float *main_data, \
float *temp_data, int stride, void *ctx) \
{ \
LIBVMAFContext *s = (LIBVMAFContext *) ctx; \
LIBVMAFContext *s = (LIBVMAFContext *) ctx; \
int ret; \
\
pthread_mutex_lock(&s->lock); \
@ -150,7 +148,7 @@ read_frame_fn(uint16_t, 10);
static void compute_vmaf_score(LIBVMAFContext *s)
{
int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
int stride, double *score, void *ctx);
int stride, void *ctx);
if (s->desc->comp[0].depth <= 8) {
read_frame = read_frame_8bit;