aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/nellymoser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-09 00:26:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-09 00:26:52 +0100
commit0abd926d64a75c78e89bfc40c5398bcf45b6824b (patch)
treecbd3aaa44aa43d9ca183fc23f72a8b26210553f5 /libavcodec/nellymoser.c
parent61b5dee49e74c400647951d1b0c26bb88116efb5 (diff)
parent450b02307cb631f501793b52b98b610c3a54378b (diff)
downloadffmpeg-0abd926d64a75c78e89bfc40c5398bcf45b6824b.tar.gz
Merge commit '450b02307cb631f501793b52b98b610c3a54378b' into release/2.4
* commit '450b02307cb631f501793b52b98b610c3a54378b': arm: Suppress tags about used cpu arch and extensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/nellymoser.c')
0 files changed, 0 insertions, 0 deletions