diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 13:40:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:16:02 +0100 |
| commit | 32fdfdfbdac64c57b12910521af1379a24d01f73 (patch) | |
| tree | 865ec201a41ac45d0ce0c58b3d7ea9a438d20d08 /ffmpeg.h | |
| parent | 3c1326411d6ffd2f30c0d6e8cc32d34b5ed5a518 (diff) | |
| parent | 354468fc12dcf93e7fb4af552e18906771913273 (diff) | |
| download | ffmpeg-32fdfdfbdac64c57b12910521af1379a24d01f73.tar.gz | |
Merge commit '354468fc12dcf93e7fb4af552e18906771913273'
* commit '354468fc12dcf93e7fb4af552e18906771913273':
avplay: switch to new refcounted frames API
avconv: convert to new refcounted AVFrame API
Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
| -rw-r--r-- | ffmpeg.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -216,6 +216,7 @@ typedef struct InputStream { int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */ AVCodec *dec; AVFrame *decoded_frame; + AVFrame *filter_frame; /* a ref of decoded_frame, to be sent to filters */ int64_t start; /* time when read started */ /* predicted dts of the next packet read for this stream or (when there are @@ -261,8 +262,6 @@ typedef struct InputStream { int w, h; } sub2video; - /* a pool of free buffers for decoded data */ - FrameBuffer *buffer_pool; int dr1; /* decoded data from this stream goes into all those filters |