Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 14 insertions, 3 deletions

diff --git a/ffmpeg.h b/ffmpeg.h
index 1ed70fd47d..89706aca7d 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -262,9 +262,6 @@ typedef struct InputStream {
     int top_field_first;
     int guess_layout_max;
 
-    /* number of packets successfully read for this stream */
-    uint64_t nb_packets;
-
     int resample_height;
     int resample_width;
     int resample_pix_fmt;
@@ -309,6 +306,15 @@ typedef struct InputStream {
     int  (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame);
     enum AVPixelFormat hwaccel_pix_fmt;
     enum AVPixelFormat hwaccel_retrieved_pix_fmt;
+
+    /* stats */
+    // combined size of all the packets read
+    uint64_t data_size;
+    /* number of packets successfully read for this stream */
+    uint64_t nb_packets;
+    // number of frames/samples retrieved from the decoder
+    uint64_t frames_decoded;
+    uint64_t samples_decoded;
 } InputStream;
 
 typedef struct InputFile {
@@ -421,6 +427,11 @@ typedef struct OutputStream {
     /* stats */
     // combined size of all the packets written
     uint64_t data_size;
+    // number of packets send to the muxer
+    uint64_t packets_written;
+    // number of frames/samples sent to the encoder
+    uint64_t frames_encoded;
+    uint64_t samples_encoded;
 } OutputStream;
 
 typedef struct OutputFile {