diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-22 20:06:47 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-22 20:06:47 -0300 |
| commit | 1fd76277708cf83572ba243e98f9e848c652f83d (patch) | |
| tree | a6dc1008a0d893df430a9debbdc201d8e8305954 /libavcodec/internal.h | |
| parent | 5b281b476b32c35527c0eea5f42161c4acad83f9 (diff) | |
| parent | 549d0bdca53af7a6e0c612ab4b03baecf3a5878f (diff) | |
Merge commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f'
* commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f':
decode: be more explicit about storing the last packet properties
Also copy pkt->size in extract_packet_props(), as it's needed for
AVFrame.pkt_size
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index e5f132a673..90a887332e 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -138,10 +138,10 @@ typedef struct AVCodecInternal { void *thread_ctx; /** - * Current packet as passed into the decoder, to avoid having to pass the - * packet into every function. + * Properties (timestamps+side data) extracted from the last packet passed + * for decoding. */ - const AVPacket *pkt; + AVPacket *last_pkt_props; /** * temporary buffer used for encoders to store their bitstream |