diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-10 23:34:15 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-10 23:34:15 +0400 |
commit | 3630a075132a8d059b16f92a291e523c1bc7ebc9 (patch) | |
tree | 37e9a6cbb8fced1a6e3f34dd348985ff8c081663 /doc | |
parent | 9e724d7216e693ba7af76caee5ccfb98c73d7a4b (diff) | |
parent | bcbb30e2a0f3be3e6b158694687d0fde2f6db625 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libmp3lame: add missing layout terminator
avconv: multithreaded demuxing.
Bump lavu minor and add an APIChanges entry for audioconvert functions.
audioconvert: add a function for extracting the channel with the given index
audioconvert: add a function for getting the name of a single channel.
audioconvert: add a function for getting channel's index in layout
audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
vf_libopencv: add missing headers.
iac: add missing dependency
Conflicts:
configure
doc/APIchanges
ffmpeg.c
libavcodec/libmp3lame.c
libavutil/avutil.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 15cf379134..eaf287fb70 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -34,6 +34,10 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2012-xx-xx - xxxxxxx - lavu 51.32.0 - audioconvert.h + Add av_get_channel_layout_channel_index(), av_get_channel_name() + and av_channel_layout_extract_channel(). + 2012-05-25 - e0e0793 - lavu 51.31.0 - opt.h Add av_opt_set_bin() |