diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 17:44:22 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 17:44:22 +0400 |
commit | 82e6660ae2372cdf96acb3bfebdd82b82f51d23f (patch) | |
tree | a3b0a2fa89a4a4e936bdd5926e2781db7c33e297 /ffmpeg.h | |
parent | c08e523586b6be36bee3f73d609733cd80a57674 (diff) | |
parent | 59444c76e6d43529a12dbd80b6dd29c6ba4079a9 (diff) |
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>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r-- | ffmpeg.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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; |