diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-05-27 12:14:33 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-06-25 12:04:32 +0200 |
commit | a3a0230a9870b9018dc7415ae5872784d524cfe5 (patch) | |
tree | e3b25576b71cdae38235c1cd480455329480d027 /avconv.h | |
parent | 3e265ca58f0505470186dce300ab66a6eac3978e (diff) |
avconv: init filtergraphs only after we have a frame on each input
This makes sure the actual stream parameters are used, which is
important mainly for hardware decoding+filtering cases, which would
previously require various weird workarounds to handle the fact that a
fake software graph has to be constructed, but never used.
This should also improve behaviour in rare cases where
avformat_find_stream_info() does not provide accurate information.
Diffstat (limited to 'avconv.h')
-rw-r--r-- | avconv.h | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -200,6 +200,8 @@ typedef struct InputFilter { struct FilterGraph *graph; uint8_t *name; + AVFifoBuffer *frame_queue; + // parameters configured for this input int format; @@ -272,14 +274,6 @@ typedef struct InputStream { AVRational framerate; /* framerate forced with -r */ 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; /* decoded data from this stream goes into all those filters * currently video and audio only */ @@ -494,7 +488,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 avconv_parse_options(int argc, char **argv); |