diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:00:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:00:59 +0200 |
| commit | e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1 (patch) | |
| tree | 6a574c3b143bdb066d2ac28c318b194171a23239 /doc/examples | |
| parent | 534b2921028aad12d581c69ae425363ffe52df0d (diff) | |
| parent | bcc94328980e6c56546792ab08b0756abdce310b (diff) | |
| download | ffmpeg-e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1.tar.gz | |
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/decoding_encoding.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index ae1057c010..976b611cc1 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -79,7 +79,7 @@ static int select_channel_layout(AVCodec *codec) { const uint64_t *p; uint64_t best_ch_layout = 0; - int best_nb_channells = 0; + int best_nb_channels = 0; if (!codec->channel_layouts) return AV_CH_LAYOUT_STEREO; @@ -88,9 +88,9 @@ static int select_channel_layout(AVCodec *codec) while (*p) { int nb_channels = av_get_channel_layout_nb_channels(*p); - if (nb_channels > best_nb_channells) { + if (nb_channels > best_nb_channels) { best_ch_layout = *p; - best_nb_channells = nb_channels; + best_nb_channels = nb_channels; } p++; } |