Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index 7fd129a2837f15b26247e234a212541be24df65d..e43c985f52d4343d79bf4a30bc8b7dc0f320553f 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -229,6 +229,7 @@ typedef struct OutputFilter {
 
     /* temporary storage until stream maps are processed */
     AVFilterInOut       *out_tmp;
+    enum AVMediaType     type;
 } OutputFilter;
 
 typedef struct FilterGraph {
@@ -455,6 +456,9 @@ typedef struct OutputStream {
     // number of frames/samples sent to the encoder
     uint64_t frames_encoded;
     uint64_t samples_encoded;
+
+    /* packet quality factor */
+    int quality;
 } OutputStream;
 
 typedef struct OutputFile {
@@ -536,6 +540,7 @@ int configure_filtergraph(FilterGraph *fg);
 int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out);
 int ist_in_filtergraph(FilterGraph *fg, InputStream *ist);
 FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
+int init_complex_filtergraph(FilterGraph *fg);
 
 int ffmpeg_parse_options(int argc, char **argv);