diff options
| author | jstebbins <[email protected]> | 2013-06-30 20:44:21 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-06-30 20:44:21 +0000 |
| commit | ba3674603258b9bd9662af2b8f2225f9e9395ca1 (patch) | |
| tree | 69cf3e5d77d21f07a57554ae5d1dd2bfa78e7f8b /libhb/internal.h | |
| parent | d6fcba15d04322d3b6495cae70b813be5c3243b4 (diff) | |
libhb: add experimental avformat muxer for mkv and mp4
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5620 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/internal.h')
| -rw-r--r-- | libhb/internal.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/libhb/internal.h b/libhb/internal.h index 4a2f775a9..d93119fb0 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -83,14 +83,15 @@ struct hb_buffer_s uint8_t discontinuity; int new_chap; // Video packets: if non-zero, is the index of the chapter whose boundary was crossed - #define HB_FRAME_IDR 0x01 - #define HB_FRAME_I 0x02 - #define HB_FRAME_AUDIO 0x04 - #define HB_FRAME_P 0x10 - #define HB_FRAME_B 0x20 - #define HB_FRAME_BREF 0x40 - #define HB_FRAME_KEY 0x0F - #define HB_FRAME_REF 0xF0 + #define HB_FRAME_IDR 0x01 + #define HB_FRAME_I 0x02 + #define HB_FRAME_AUDIO 0x04 + #define HB_FRAME_SUBTITLE 0x08 + #define HB_FRAME_P 0x10 + #define HB_FRAME_B 0x20 + #define HB_FRAME_BREF 0x40 + #define HB_FRAME_KEY 0x0F + #define HB_FRAME_REF 0xF0 uint8_t frametype; uint16_t flags; } s; @@ -466,7 +467,9 @@ typedef struct hb_mux_data_s hb_mux_data_t; hb_mux_object_t * hb_mux_##a##_init( hb_job_t * ); DECLARE_MUX( mp4 ); -DECLARE_MUX( avi ); -DECLARE_MUX( ogm ); DECLARE_MUX( mkv ); +DECLARE_MUX( avformat ); +void hb_muxmp4_process_subtitle_style( uint8_t *input, + uint8_t *output, + uint8_t *style, uint16_t *stylesize ); |