diff options
Diffstat (limited to 'ffmpeg.h')
| -rw-r--r-- | ffmpeg.h | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -233,6 +233,9 @@ typedef struct InputFilter { struct InputStream *ist; struct FilterGraph *graph; uint8_t *name; + enum AVMediaType type; // AVMEDIA_TYPE_SUBTITLE for sub2video + + AVFifoBuffer *frame_queue; // parameters configured for this input int format; @@ -321,14 +324,6 @@ typedef struct InputStream { int guess_layout_max; int autorotate; - int resample_height; - int resample_width; - int resample_pix_fmt; - - int resample_sample_fmt; - int resample_sample_rate; - int resample_channels; - uint64_t resample_channel_layout; int fix_sub_duration; struct { /* previous decoded subtitle and related variables */ @@ -379,6 +374,8 @@ typedef struct InputStream { int64_t *dts_buffer; int nb_dts_buffer; + + int got_output; } InputStream; typedef struct InputFile { @@ -507,6 +504,8 @@ typedef struct OutputStream { // parameters are set in the AVStream. int initialized; + int inputs_done; + const char *attachment_filename; int copy_initial_nonkeyframes; int copy_prior_start; @@ -636,7 +635,6 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost); int init_complex_filtergraph(FilterGraph *fg); int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame); -int ifilter_parameters_from_decoder(InputFilter *ifilter, const AVCodecContext *avctx); int ffmpeg_parse_options(int argc, char **argv); @@ -645,7 +643,6 @@ int dxva2_init(AVCodecContext *s); int vda_init(AVCodecContext *s); int videotoolbox_init(AVCodecContext *s); int qsv_init(AVCodecContext *s); -int qsv_transcode_init(OutputStream *ost); int vaapi_decode_init(AVCodecContext *avctx); int vaapi_device_init(const char *device); int cuvid_init(AVCodecContext *s); |