OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix VC1 I-frame detection in ffmpeg_is_keyframe
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
common.h
diff --git
a/libhb/common.h
b/libhb/common.h
index
488004f
..
fb1f211
100644
(file)
--- a/
libhb/common.h
+++ b/
libhb/common.h
@@
-18,6
+18,12
@@
#include <sys/stat.h>
#include <dirent.h>
#include <sys/stat.h>
#include <dirent.h>
+#if defined( __GNUC__ ) && !(defined( _WIN32 ) || defined( __MINGW32__ ))
+# define HB_WPRINTF(s,v) __attribute__((format(printf,s,v)))
+#else
+# define HB_WPRINTF(s,v)
+#endif
+
#if defined( SYS_MINGW )
# define fseek fseeko64
# define ftell ftello64
#if defined( SYS_MINGW )
# define fseek fseeko64
# define ftell ftello64
@@
-96,6
+102,9
@@
int hb_audio_add(const hb_job_t * job, const hb_audio_config_t * audiocfg);
hb_audio_config_t * hb_list_audio_config_item(hb_list_t * list, int i);
int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, int track);
hb_audio_config_t * hb_list_audio_config_item(hb_list_t * list, int i);
int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, int track);
+int hb_srt_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg,
+ const char *lang);
+
struct hb_rate_s
{
struct hb_rate_s
{
@@
-115,7
+124,10
@@
struct hb_subtitle_config_s
{
enum subdest { RENDERSUB, PASSTHRUSUB } dest;
int force;
{
enum subdest { RENDERSUB, PASSTHRUSUB } dest;
int force;
- int default_track;
+ int default_track;
+ char src_filename[128];
+ char src_codeset[40];
+ int64_t offset;
};
#define HB_VIDEO_RATE_BASE 27000000
};
#define HB_VIDEO_RATE_BASE 27000000
@@
-671,6
+683,7
@@
extern hb_work_object_t hb_decmpeg2;
extern hb_work_object_t hb_decvobsub;
extern hb_work_object_t hb_encvobsub;
extern hb_work_object_t hb_deccc608;
extern hb_work_object_t hb_decvobsub;
extern hb_work_object_t hb_encvobsub;
extern hb_work_object_t hb_deccc608;
+extern hb_work_object_t hb_decsrtsub;
extern hb_work_object_t hb_render;
extern hb_work_object_t hb_encavcodec;
extern hb_work_object_t hb_encx264;
extern hb_work_object_t hb_render;
extern hb_work_object_t hb_encavcodec;
extern hb_work_object_t hb_encx264;