Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EHN: Visual studio 2015 build error fixing #62

Open
wants to merge 1 commit into
base: hevc_rext
Choose a base branch
from
Open

EHN: Visual studio 2015 build error fixing #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
)
endif()

if(WIN32)
add_definitions(
-Dsnprintf=avpriv_snprintf
-Dvsnprintf=avpriv_vsnprintf
-Dinline=__inline
-Drestrict=__restrict
)
endif()
#if(WIN32)
#add_definitions(
#-Dsnprintf=avpriv_snprintf
#-Dvsnprintf=avpriv_vsnprintf
#-Dinline=__inline
#-Drestrict=__restrict
#)
#endif()

#define asm sources
if(NOT ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l") )
Expand Down
6 changes: 3 additions & 3 deletions libavcodec/frame_thread_encoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "avcodec.h"

int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options);
void ff_frame_thread_encoder_free(AVCodecContext *avctx);
int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr);
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options) {};
void ff_frame_thread_encoder_free(AVCodecContext *avctx) {};
int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr) {};

2 changes: 2 additions & 0 deletions libavcodec/hevcdsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,3 +1326,5 @@ int i = 0;
if (ARCH_X86) ff_hevcdsp_init_x86(hevcdsp, bit_depth);
if (ARCH_ARM) ff_hevcdsp_init_arm(hevcdsp, bit_depth);
}

void ff_hevcdsp_init_arm(HEVCDSPContext *c, const int bit_depth) {};
6 changes: 6 additions & 0 deletions libavcodec/videodsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,9 @@ av_cold void ff_videodsp_init(VideoDSPContext *ctx, int bpc)
if (ARCH_X86)
ff_videodsp_init_x86(ctx, bpc);
}


void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc) {};
void ff_videodsp_init_arm(VideoDSPContext *ctx, int bpc) {};
void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc) {};
void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc) {};
2 changes: 1 addition & 1 deletion libavcodec/x86/hevc_sao_sse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static av_always_inline void ff_hevc_sao_edge_filter_ ## D ##_sse( \
}

//SAO_EDGE_FILTER( 8)
static __attribute__((always_inline)) inline void ff_hevc_sao_edge_filter_8_sse(
static av_always_inline void ff_hevc_sao_edge_filter_8_sse(
uint8_t *_dst, uint8_t *_src,
ptrdiff_t _stride_dst, ptrdiff_t _stride_src,
struct SAOParams *sao,
Expand Down
5 changes: 5 additions & 0 deletions libavutil/x86/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,8 @@ int ff_get_cpu_flags_x86(void)

return rval;
}


int ff_get_cpu_flags_aarch64(void) {};
int ff_get_cpu_flags_arm(void) {};
int ff_get_cpu_flags_ppc(void) {};