X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=output%2Foutput.h;h=e32dbbead416e65ede2455554db81aebf066cc2f;hb=77cc44feea75106fae6d3113f6babbbe8cffba87;hp=5409f152183937126ccea9a13f853e33c6b7fda7;hpb=a0df454b358000eb4f5485f8d09a2620fa6c32e5;p=x264 diff --git a/output/output.h b/output/output.h index 5409f152..e32dbbea 100644 --- a/output/output.h +++ b/output/output.h @@ -1,7 +1,7 @@ /***************************************************************************** * output.h: x264 file output modules ***************************************************************************** - * Copyright (C) 2003-2009 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -19,22 +19,33 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + * + * This program is also available under a commercial proprietary license. + * For more information, contact us at licensing@x264.com. *****************************************************************************/ #ifndef X264_OUTPUT_H #define X264_OUTPUT_H +#include "x264cli.h" + +typedef struct +{ + int use_dts_compress; +} cli_output_opt_t; + typedef struct { - int (*open_file)( char *psz_filename, hnd_t *p_handle ); + int (*open_file)( char *psz_filename, hnd_t *p_handle, cli_output_opt_t *opt ); int (*set_param)( hnd_t handle, x264_param_t *p_param ); - int (*write_nalu)( hnd_t handle, uint8_t *p_nal, int i_size ); - int (*set_eop)( hnd_t handle, x264_picture_t *p_picture ); - int (*close_file)( hnd_t handle ); + int (*write_headers)( hnd_t handle, x264_nal_t *p_nal ); + int (*write_frame)( hnd_t handle, uint8_t *p_nal, int i_size, x264_picture_t *p_picture ); + int (*close_file)( hnd_t handle, int64_t largest_pts, int64_t second_largest_pts ); } cli_output_t; -extern cli_output_t raw_output; -extern cli_output_t mkv_output; -extern cli_output_t mp4_output; +extern const cli_output_t raw_output; +extern const cli_output_t mkv_output; +extern const cli_output_t mp4_output; +extern const cli_output_t flv_output; #endif