diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-03 14:53:58 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-03 14:53:58 +0100 |
commit | b6422902d84ec8df6f5a64ffd8743e93307bd8e9 (patch) | |
tree | 72f9c0209b0f26cf4c1b93f4238b5861005294ed /ffmpeg.h | |
parent | 3932ccc472ad4f4d370dcfc1c2f574b0f3acb88c (diff) | |
parent | 722ec3eb35bc152ce91d0a4502eca0df1c0086d0 (diff) | |
download | ffmpeg-streaming-b6422902d84ec8df6f5a64ffd8743e93307bd8e9.zip ffmpeg-streaming-b6422902d84ec8df6f5a64ffd8743e93307bd8e9.tar.gz |
Merge commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0'
* commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0':
avconv: decouple configuring filtergraphs and setting input parameters
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r-- | ffmpeg.h | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -231,6 +231,18 @@ typedef struct InputFilter { struct InputStream *ist; struct FilterGraph *graph; uint8_t *name; + + // parameters configured for this input + int format; + + int width, height; + AVRational sample_aspect_ratio; + + int sample_rate; + int channels; + uint64_t channel_layout; + + AVBufferRef *hw_frames_ctx; } InputFilter; typedef struct OutputFilter { @@ -600,6 +612,9 @@ int filtergraph_is_simple(FilterGraph *fg); 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); int vdpau_init(AVCodecContext *s); |