Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'

* commit '6064f697a321174232a3fad351afb21150c3e9e5':
  lavc: Enable side data only packets by default

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-09-12 15:12:05 +02:00
5 changed files with 22 additions and 10 deletions

View File

@@ -1352,7 +1352,9 @@ typedef struct AVPacketSideData {
* then passed to muxers.
*
* For video, it should typically contain one compressed frame. For audio it may
* contain several compressed frames.
* contain several compressed frames. Encoders are allowed to output empty
* packets, with no compressed data, containing only side data
* (e.g. to update some stream parameters at the end of encoding).
*
* AVPacket is one of the few structs in FFmpeg, whose size is a part of public
* ABI. Thus it may be allocated on stack and no new fields can be added to it
@@ -3105,20 +3107,20 @@ typedef struct AVCodecContext {
*/
uint64_t vbv_delay;
#if FF_API_SIDEDATA_ONLY_PKT
/**
* Encoding only. Allow encoders to output packets that do not contain any
* encoded data, only side data.
* Encoding only and set by default. 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.
* @deprecated this field disables the default behaviour and
* it is kept only for compatibility.
*/
attribute_deprecated
int side_data_only_packets;
#endif
/**
* Audio only. The number of "priming" samples (padding) inserted by the