generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'

Browse Source 
* commit '79ae1e630b476889c251fc905687a3831b43ab5e':
  avcodec: Define side data type for fallback track

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2015-11-22 17:41:27 +00:00
commit fe20e34b13
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -14,6 +14,10 @@ libavutil: 2015-08-28
API changes, most recent first: 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 2015-11-xx - xxxxxxx - lavf 57.19.100 - avformat.h
Add av_stream_new_side_data(). Add av_stream_new_side_data().

8
libavcodec/avcodec.h
View File

@ -1284,6 +1284,14 @@ enum AVPacketSideDataType {
*/ */
AV_PKT_DATA_QUALITY_STATS, 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 * Recommmends skipping the specified number of samples
* @code * @code

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 15 #define LIBAVCODEC_VERSION_MINOR 16
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \