diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 00:54:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 00:54:42 +0200 |
commit | e5bae39f46e55843c025d280ed5441e358e59f2e (patch) | |
tree | e2de68b736efbb95d8e83a99fdfccf7a948b62f4 /libavformat | |
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 'libavformat')
-rw-r--r-- | libavformat/dump.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index 1da29b9462..bb7779daf9 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -377,6 +377,9 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent) av_log(ctx, AV_LOG_INFO, "audio service type: "); dump_audioservicetype(ctx, &sd); break; + case AV_PKT_DATA_QUALITY_FACTOR: + av_log(ctx, AV_LOG_INFO, "quality factor: %d", *(int *)sd.data); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", sd.type, sd.size); |