diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:05:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:05:29 +0100 |
commit | a2bc6c116ddc15af47e092af874a0647d114a9f6 (patch) | |
tree | 6232f821ac4664d831e3a74ccaac67fa2b8664f6 /doc | |
parent | fdf8b59b28cbe458ca6933bbb9394936a5fcbf91 (diff) | |
parent | c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c (diff) | |
download | ffmpeg-a2bc6c116ddc15af47e092af874a0647d114a9f6.tar.gz |
Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 77a9e4eacd..22558c92a3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-02-xx - xxxxxxx - lavu 53.3.0 - frame.h + Add AV_FRAME_DATA_DOWNMIX_INFO value to the AVFrameSideDataType enum and + downmix_info.h API, which identify downmix-related metadata. + 2014-02-11 - 1b05ac2 - lavf 55.32.100 - avformat.h Add av_write_uncoded_frame() and av_interleaved_write_uncoded_frame(). |