diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:41:27 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:41:27 +0000 |
| commit | fe20e34b139fde727d23c7f50c310e11567bcc5f (patch) | |
| tree | 0bdca4ece274a425c0df95e1ed0b138a94dd8f96 | |
| parent | ad317c94c5fad00f97881263647e316344f0a81e (diff) | |
| parent | 79ae1e630b476889c251fc905687a3831b43ab5e (diff) | |
| download | ffmpeg-fe20e34b139fde727d23c7f50c310e11567bcc5f.tar.gz | |
Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'
* commit '79ae1e630b476889c251fc905687a3831b43ab5e':
avcodec: Define side data type for fallback track
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index a2370b33e1..d927e5679d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2015-11-xx - xxxxxxx - lavc 57.16.0 - avcodec.h + Add AV_PKT_DATA_FALLBACK_TRACK for making fallback associations between + streams. + 2015-11-xx - xxxxxxx - lavf 57.19.100 - avformat.h Add av_stream_new_side_data(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1af17ed569..448ba8ae25 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1285,6 +1285,14 @@ enum AVPacketSideDataType { AV_PKT_DATA_QUALITY_STATS, /** + * This side data contains an integer value representing the stream index + * of a "fallback" track. A fallback track indicates an alternate + * track to use when the current track can not be decoded for some reason. + * e.g. no decoder available for codec. + */ + AV_PKT_DATA_FALLBACK_TRACK, + + /** * Recommmends skipping the specified number of samples * @code * u32le number of samples to skip from start of this packet diff --git a/libavcodec/version.h b/libavcodec/version.h index 1e21f155fc..5eecf5b7cd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 15 +#define LIBAVCODEC_VERSION_MINOR 16 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |