Fix a case in which VBV underflows can occur

[x264] / muxers.h

diff --git a/muxers.h b/muxers.h
index 1386ed4d63e8b0070091013f7b6913e3de3a8798..aaede1c0b7d13adf0160403b29efc70201a01b70 100644 (file)
--- a/muxers.h
+++ b/muxers.h
@@ -1,19 +1,50 @@
-#ifndef _X264_MUXERS_H_
-#define _X264_MUXERS_H_
+/*****************************************************************************
+ * muxers.c: h264 file i/o plugins
+ *****************************************************************************
+ * Copyright (C) 2003-2008 x264 project
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Loren Merritt <lorenm@u.washington.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef X264_MUXERS_H
+#define X264_MUXERS_H
 
 typedef void *hnd_t;
 
 int open_file_yuv( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
-int get_frame_total_yuv( hnd_t handle, int i_width, int i_height );
-int read_frame_yuv( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height );
+int get_frame_total_yuv( hnd_t handle );
+int read_frame_yuv( x264_picture_t *p_pic, hnd_t handle, int i_frame );
 int close_file_yuv( hnd_t handle );
 
-#ifdef AVIS_INPUT
+int open_file_y4m( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
+int get_frame_total_y4m( hnd_t handle );
+int read_frame_y4m( x264_picture_t *p_pic, hnd_t handle, int i_frame );
+int close_file_y4m( hnd_t handle );
+
 int open_file_avis( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
-int get_frame_total_avis( hnd_t handle, int i_width, int i_height );
-int read_frame_avis( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height );
+int get_frame_total_avis( hnd_t handle );
+int read_frame_avis( x264_picture_t *p_pic, hnd_t handle, int i_frame );
 int close_file_avis( hnd_t handle );
-#endif
+
+int open_file_thread( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
+int get_frame_total_thread( hnd_t handle );
+int read_frame_thread( x264_picture_t *p_pic, hnd_t handle, int i_frame );
+int close_file_thread( hnd_t handle );
 
 int open_file_bsf( char *psz_filename, hnd_t *p_handle );
 int set_param_bsf( hnd_t handle, x264_param_t *p_param );
@@ -21,13 +52,11 @@ int write_nalu_bsf( hnd_t handle, uint8_t *p_nal, int i_size );
 int set_eop_bsf( hnd_t handle,  x264_picture_t *p_picture );
 int close_file_bsf( hnd_t handle );
 
-#ifdef MP4_OUTPUT
 int open_file_mp4( char *psz_filename, hnd_t *p_handle );
 int set_param_mp4( hnd_t handle, x264_param_t *p_param );
 int write_nalu_mp4( hnd_t handle, uint8_t *p_nal, int i_size );
 int set_eop_mp4( hnd_t handle, x264_picture_t *p_picture );
 int close_file_mp4( hnd_t handle );
-#endif
 
 int open_file_mkv( char *psz_filename, hnd_t *p_handle );
 int set_param_mkv( hnd_t handle, x264_param_t *p_param );
@@ -35,4 +64,9 @@ int write_nalu_mkv( hnd_t handle, uint8_t *p_nal, int i_size );
 int set_eop_mkv( hnd_t handle, x264_picture_t *p_picture );
 int close_file_mkv( hnd_t handle );
 
+extern int (*p_open_infile)( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
+extern int (*p_get_frame_total)( hnd_t handle );
+extern int (*p_read_frame)( x264_picture_t *p_pic, hnd_t handle, int i_frame );
+extern int (*p_close_infile)( hnd_t handle );
+
 #endif