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
x264 bump to r1339-82b80ef
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
internal.h
diff --git
a/libhb/internal.h
b/libhb/internal.h
index
7d75948
..
9a03074
100644
(file)
--- a/
libhb/internal.h
+++ b/
libhb/internal.h
@@
-7,7
+7,7
@@
/***********************************************************************
* common.c
**********************************************************************/
/***********************************************************************
* common.c
**********************************************************************/
-void hb_log( char * log, ... );
+void hb_log( char * log, ... )
HB_WPRINTF(1,2)
;
extern int global_verbosity_level; // Global variable for hb_deep_log
typedef enum hb_debug_level_s
{
extern int global_verbosity_level; // Global variable for hb_deep_log
typedef enum hb_debug_level_s
{
@@
-15,8
+15,8
@@
typedef enum hb_debug_level_s
HB_HOUSEKEEPING_LOG = 2, // stuff we hate scrolling through
HB_GRANULAR_LOG = 3 // sample-by-sample
} hb_debug_level_t;
HB_HOUSEKEEPING_LOG = 2, // stuff we hate scrolling through
HB_GRANULAR_LOG = 3 // sample-by-sample
} hb_debug_level_t;
-void hb_deep_log( hb_debug_level_t level, char * log, ... );
-void hb_error( char * fmt, ...);
+void hb_deep_log( hb_debug_level_t level, char * log, ... )
HB_WPRINTF(2,3)
;
+void hb_error( char * fmt, ...)
HB_WPRINTF(1,2)
;
int hb_list_bytes( hb_list_t * );
void hb_list_seebytes( hb_list_t * l, uint8_t * dst, int size );
int hb_list_bytes( hb_list_t * );
void hb_list_seebytes( hb_list_t * l, uint8_t * dst, int size );
@@
-189,6
+189,9
@@
void hb_stream_close( hb_stream_t ** );
hb_title_t * hb_stream_title_scan( hb_stream_t *);
int hb_stream_read( hb_stream_t *, hb_buffer_t *);
int hb_stream_seek( hb_stream_t *, float );
hb_title_t * hb_stream_title_scan( hb_stream_t *);
int hb_stream_read( hb_stream_t *, hb_buffer_t *);
int hb_stream_seek( hb_stream_t *, float );
+int hb_stream_seek_chapter( hb_stream_t *, int );
+int hb_stream_chapter( hb_stream_t * );
+
void * hb_ffmpeg_context( int codec_param );
void * hb_ffmpeg_avstream( int codec_param );
void * hb_ffmpeg_context( int codec_param );
void * hb_ffmpeg_avstream( int codec_param );
@@
-254,10
+257,12
@@
enum
{
WORK_SYNC = 1,
WORK_DECMPEG2,
{
WORK_SYNC = 1,
WORK_DECMPEG2,
- WORK_DECSUB,
+ WORK_DECCC608,
+ WORK_DECVOBSUB,
+ WORK_DECSRTSUB,
+ WORK_ENCVOBSUB,
WORK_RENDER,
WORK_ENCAVCODEC,
WORK_RENDER,
WORK_ENCAVCODEC,
- WORK_ENCXVID,
WORK_ENCX264,
WORK_ENCTHEORA,
WORK_DECA52,
WORK_ENCX264,
WORK_ENCTHEORA,
WORK_DECA52,
@@
-269,7
+274,8
@@
enum
WORK_DECLPCM,
WORK_ENCFAAC,
WORK_ENCLAME,
WORK_DECLPCM,
WORK_ENCFAAC,
WORK_ENCLAME,
- WORK_ENCVORBIS
+ WORK_ENCVORBIS,
+ WORK_ENC_CA_AAC
};
enum
};
enum