summaryrefslogtreecommitdiff
path: root/libavutil/display.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavutil/display.c')
-rw-r--r--libavutil/display.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/libavutil/display.c b/libavutil/display.c
index 74aceb2847..53e8aa255f 100644
--- a/libavutil/display.c
+++ b/libavutil/display.c
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2014 Vittorio Giovara <vittorio.giovara@gmail.com>
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -35,10 +35,8 @@ double av_display_rotation_get(const int32_t matrix[9])
{
double rotation, scale[2];
- scale[0] = sqrt(CONV_FP(matrix[0]) * CONV_FP(matrix[0]) +
- CONV_FP(matrix[3]) * CONV_FP(matrix[3]));
- scale[1] = sqrt(CONV_FP(matrix[1]) * CONV_FP(matrix[1]) +
- CONV_FP(matrix[4]) * CONV_FP(matrix[4]));
+ scale[0] = hypot(CONV_FP(matrix[0]), CONV_FP(matrix[3]));
+ scale[1] = hypot(CONV_FP(matrix[1]), CONV_FP(matrix[4]));
if (scale[0] == 0.0 || scale[1] == 0.0)
return NAN;