Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
	ffmpeg.c

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

1 files changed, 3 insertions, 0 deletions

diff --git a/ffmpeg.h b/ffmpeg.h
index 4fc1e18..5d6c84f 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -262,6 +262,9 @@ 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;