Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Apr 2013 11:00:59 +0000 (13:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Apr 2013 11:00:59 +0000 (13:00 +0200)
commite7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1
tree6a574c3b143bdb066d2ac28c318b194171a23239
parent534b2921028aad12d581c69ae425363ffe52df0d
parentbcc94328980e6c56546792ab08b0756abdce310b
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>
doc/examples/decoding_encoding.c
libavformat/matroskadec.c
libavutil/opt.c