aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-17 15:23:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-17 15:23:11 +0100
commit5049b6a1fe52f549bad6721f162b4ec2d9d0a357 (patch)
treed62ca24e8d518600e8c6fee9f5ac2471fcd9ba99 /libavcodec/arm
parent045d80076a67aade020417f4adcb026b6a3da823 (diff)
parentf9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd (diff)
downloadffmpeg-5049b6a1fe52f549bad6721f162b4ec2d9d0a357.tar.gz
Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'
* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd': mp3enc: add an option for disabling the Xing frame. Conflicts: doc/muxers.texi libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
0 files changed, 0 insertions, 0 deletions