diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:54:42 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:54:42 +0300 |
| commit | e5bae39f46e55843c025d280ed5441e358e59f2e (patch) | |
| tree | e2de68b736efbb95d8e83a99fdfccf7a948b62f4 /libavcodec/avcodec.h | |
| parent | b1fad7ac200d0779a44fc267085d7d46ce2391b9 (diff) | |
| parent | 5d3addb937946eca5391e40b5e6308e74ac6f77b (diff) | |
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
Add a quality factor packet side data
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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 62205c9896..cc2f3cce4d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1055,6 +1055,13 @@ enum AVPacketSideDataType { AV_PKT_DATA_AUDIO_SERVICE_TYPE, /** + * This side data contains an integer value representing the quality + * factor of the compressed frame. Allowed range is between 1 (good) + * and FF_LAMBDA_MAX (bad). + */ + AV_PKT_DATA_QUALITY_FACTOR, + + /** * Recommmends skipping the specified number of samples * @code * u32le number of samples to skip from start of this packet |