diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:46:38 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:46:38 +0400 |
commit | 03bb99ae1a99fa315621308b885a8fc70702c9bc (patch) | |
tree | d21c922164f5f18348a3e5f060a7ad9b42de8999 /libavcodec/avcodec.h | |
parent | 0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01 (diff) | |
parent | 0957b274e312e985d69cb490bee2a7ff820acaa6 (diff) |
Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'
* commit '0957b274e312e985d69cb490bee2a7ff820acaa6':
lavc: add an option to enable side data-only packets during encoding
Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 463fc04a6e..d52f245060 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2931,6 +2931,21 @@ typedef struct AVCodecContext { uint64_t vbv_delay; /** + * Encoding only. Allow encoders to output packets that do not contain any + * encoded data, only side data. + * + * Some encoders need to output such packets, e.g. to update some stream + * parameters at the end of encoding. + * + * All callers are strongly recommended to set this option to 1 and update + * their code to deal with such packets, since this behaviour may become + * always enabled in the future (then this option will be deprecated and + * later removed). To avoid ABI issues when this happens, the callers should + * use AVOptions to set this field. + */ + int side_data_only_packets; + + /** * 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) |