diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:41:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:41:10 +0100 |
| commit | d16079abf473b51be7686d20f8014bb48a095722 (patch) | |
| tree | 1f9ac5e0111d5eaddd886fb9866abf5e30bd59c7 /libavcodec/avcodec.h | |
| parent | 57089084ba7ece20889b8196f68ad9b08e8db8ba (diff) | |
| parent | 57b6704ecd0f56d6a3092e448687cfd837bb0ac1 (diff) | |
Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'
* commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1':
avcodec: add AVCodecContext.sw_pix_fmt
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4b6b00cd02..527824601e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3005,6 +3005,13 @@ typedef struct AVCodecContext { AVRational framerate; /** + * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx. + * - encoding: unused. + * - decoding: Set by libavcodec before calling get_format() + */ + enum AVPixelFormat sw_pix_fmt; + + /** * Timebase in which pkt_dts/pts and AVPacket.dts/pts are. * Code outside libavcodec should access this field using: * av_codec_{get,set}_pkt_timebase(avctx) |