Skip to content

[FIX] Remove unconditional VBI_DEBUG define — add CMake option for opt-in debug builds #2168

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

Open
Varadraj75 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −3
Open

[FIX] Remove unconditional VBI_DEBUG define — add CMake option for opt-in debug builds #2168

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
1 change: 1 addition & 0 deletions docs/CHANGES.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.96.7 (unreleased)
-------------------
- Fix: Remove unconditional VBI_DEBUG define — add CMake option -DVBI_DEBUG=ON for opt-in debug builds (#2167)
- Fix: Remove strdup() memory leaks in WebVTT styling encoder, fix invalid CSS rgba(0,256,0) green value, fix missing free(unescaped) on write-error path (#2154)
- Fix: Prevent crash in Rust timing module when logging out-of-range PTS/FTS timestamps from malformed streams.

Expand Down
8 changes: 7 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required (VERSION 3.24.0)
project (CCExtractor)

include (CTest)

option (WITH_FFMPEG "Build using FFmpeg demuxer and decoder" OFF)
option (WITH_OCR "Build with OCR (Optical Character Recognition) feature" OFF)
option (WITH_HARDSUBX "Build with support for burned-in subtitles" OFF)
option (VBI_DEBUG "Enable VBI decoder debug output" OFF)

# Version number
set (CCEXTRACTOR_VERSION_MAJOR 0)
Expand Down Expand Up @@ -145,6 +145,11 @@ else (MSVC)
endif(MSVC)

set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")

if (VBI_DEBUG)
add_definitions(-DVBI_DEBUG)
message(STATUS "VBI debug output enabled")
endif (VBI_DEBUG)
add_subdirectory (lib_ccx)

aux_source_directory(${PROJECT_SOURCE_DIR} SOURCEFILE)
Expand Down Expand Up @@ -243,6 +248,7 @@ if (PKG_CONFIG_FOUND AND WITH_HARDSUBX)
set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${LEPTONICA_INCLUDE_DIRS})
endif (PKG_CONFIG_FOUND AND WITH_HARDSUBX)


add_executable (ccextractor ${SOURCEFILE} ${FREETYPE_SOURCE} ${UTF8PROC_SOURCE})

########################################################
Expand Down
5 changes: 3 additions & 2 deletions src/lib_ccx/ccx_decoders_vbi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define CCX_DECODER_VBI

#include "zvbi/zvbi_decoder.h"
#define VBI_DEBUG

#include "ccx_decoders_structs.h"
#include "ccx_decoders_common.h"
Expand All @@ -11,6 +10,8 @@ struct ccx_decoder_vbi_cfg
{
#ifdef VBI_DEBUG
char *debug_file_name;
#else
int reserved; /* ensure non-empty struct in non-debug builds (MSVC C2016) */
#endif
};

Expand All @@ -24,4 +25,4 @@ struct ccx_decoder_vbi_ctx
#endif
};

#endif
#endif
Loading