Revision 393cbb96 libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
32 32
#include "libavutil/cpu.h"
33 33

  
34 34
#define LIBAVCODEC_VERSION_MAJOR 52
35
#define LIBAVCODEC_VERSION_MINOR 104
35
#define LIBAVCODEC_VERSION_MINOR 105
36 36
#define LIBAVCODEC_VERSION_MICRO  0
37 37

  
38 38
#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
1009 1009
     * - decoding: Set by libavcodec\
1010 1010
     */\
1011 1011
    void *hwaccel_picture_private;\
1012
\
1013
    /**\
1014
     * reordered pts from the last AVPacket that has been input into the decoder\
1015
     * - encoding: unused\
1016
     * - decoding: Read by user.\
1017
     */\
1018
    int64_t pkt_pts;\
1012 1019

  
1013 1020

  
1014 1021
#define FF_QSCALE_TYPE_MPEG1 0
......
2791 2798
     */
2792 2799
    uint8_t *subtitle_header;
2793 2800
    int subtitle_header_size;
2801

  
2802
    /**
2803
     * Current packet as passed into the decoder, to avoid having
2804
     * to pass the packet into every function. Currently only valid
2805
     * inside lavc and get/release_buffer callbacks.
2806
     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
2807
     * - encoding: unused
2808
     */
2809
    AVPacket *pkt;
2794 2810
} AVCodecContext;
2795 2811

  
2796 2812
/**

Also available in: Unified diff