Skip to content

Commit 0311bc1

Browse files
committed
Fix public header includes
Applications, and thus our public headers, should be included as `#include <libvmaf/libvmaf.h>`. Adding `include/libvmaf` into include directories means applications could do e.g. `#include <feature.h>` which is ambiguous.
1 parent 5611a1e commit 0311bc1

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

libvmaf/include/libvmaf/libvmaf.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <stdint.h>
2323
#include <stdio.h>
2424

25-
#include "libvmaf/model.h"
26-
#include "libvmaf/picture.h"
27-
#include "libvmaf/feature.h"
25+
#include <libvmaf/model.h>
26+
#include <libvmaf/picture.h>
27+
#include <libvmaf/feature.h>
2828

2929
#ifdef __cplusplus
3030
extern "C" {

libvmaf/include/libvmaf/libvmaf_cuda.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef __VMAF_CUDA_H__
2020
#define __VMAF_CUDA_H__
2121

22-
#include "libvmaf/libvmaf.h"
22+
#include <libvmaf/libvmaf.h>
2323

2424
#ifdef __cplusplus
2525
extern "C" {

libvmaf/include/libvmaf/model.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <stdint.h>
2323

24-
#include "feature.h"
24+
#include <libvmaf/feature.h>
2525

2626
#ifdef __cplusplus
2727
extern "C" {

libvmaf/src/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,5 +572,4 @@ pkg_mod.generate(libraries: libvmaf,
572572
name: 'libvmaf',
573573
filebase: 'libvmaf',
574574
description: 'VMAF, Video Multimethod Assessment Fusion',
575-
subdirs: [ '.', 'libvmaf']
576575
)

0 commit comments

Comments
 (0)