aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-04 13:00:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-04 13:00:59 +0200
commite7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1 (patch)
tree6a574c3b143bdb066d2ac28c318b194171a23239 /libavfilter
parent534b2921028aad12d581c69ae425363ffe52df0d (diff)
parentbcc94328980e6c56546792ab08b0756abdce310b (diff)
downloadffmpeg-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 'libavfilter')
0 files changed, 0 insertions, 0 deletions