aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/softfloat.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-28 11:32:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-28 11:33:59 +0200
commit87d38ad803b81dd4a4afb6607b3863605403dc9c (patch)
treeda0b988d1b503c6ebf2c4e0d1fa4f5dfd6e4d26e /libavutil/softfloat.c
parent70106e73c5b4157fcaed131907ed10ab2de83f5d (diff)
parentf812eeda17e38797df5cb733ce99cdfd829d84ca (diff)
downloadffmpeg-87d38ad803b81dd4a4afb6607b3863605403dc9c.tar.gz
Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'
* commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca': matroskaenc: Fix writing TRACKDEFAULTFLAG Conflicts: libavformat/matroskaenc.c tests/fate/wavpack.mak tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/softfloat.c')
0 files changed, 0 insertions, 0 deletions