aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/softfloat.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-17 15:31:18 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-17 15:34:24 +0100
commit58770db2ae67d9b4b6adcf2b15951f9608442051 (patch)
treea155b0f27369b59cfa7651a4a1ecd6627d3d8a58 /libavutil/softfloat.c
parent5049b6a1fe52f549bad6721f162b4ec2d9d0a357 (diff)
parent33018907bd07b34e0e70d5ae12097265eb3734d7 (diff)
downloadffmpeg-58770db2ae67d9b4b6adcf2b15951f9608442051.tar.gz
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
* commit '33018907bd07b34e0e70d5ae12097265eb3734d7': mp3enc: allow omitting the id3v2 header with -id3v2_version 0 Conflicts: doc/muxers.texi libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/softfloat.c')
0 files changed, 0 insertions, 0 deletions