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 /libavcodec/libmp3lame.c | |
| 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 'libavcodec/libmp3lame.c')
| -rw-r--r-- | libavcodec/libmp3lame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 905d9a0d4c..5019287560 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -305,7 +305,7 @@ AVCodec ff_libmp3lame_encoder = { .supported_samplerates = libmp3lame_sample_rates, .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, - 0}, + 0 }, .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), .priv_class = &libmp3lame_class, .defaults = libmp3lame_defaults, |