eden-emu/FFmpeg
15
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-23 21:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'bcc9432898'

Browse source 
* commit 'bcc9432898':
  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>
This commit is contained in:
Michael Niedermayer 2013-04-04 13:00:59 +02:00
commit e7389ed5d0
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/examples/decoding_encoding.c
View file

@ -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++;
}