summaryrefslogtreecommitdiff
path: root/libavutil/display.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-03-17 17:38:48 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-03-23 20:53:28 +0000
commite4fe535d12f4f30df2dd672e30304af112a5a827 (patch)
tree1ed7edafbb76a3dadaf01e190c681682f8873896 /libavutil/display.c
parente0046bc9c96150fa06146ace9093f06857dd7b23 (diff)
mov: Write the display matrix in order
This will allow to copy the matrix as is and it is just cleaner to keep the matrix in the same order specified by the mov standard (which is also explicitly described in the documentation). In order to preserve compatibility, flip the angle sign in the display API av_display_rotation_set() and av_display_rotation_get(), and improve the documentation mentioning the rotation direction.
Diffstat (limited to 'libavutil/display.c')
-rw-r--r--libavutil/display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/display.c b/libavutil/display.c
index 74aceb2847..f7500948ff 100644
--- a/libavutil/display.c
+++ b/libavutil/display.c
@@ -46,12 +46,12 @@ double av_display_rotation_get(const int32_t matrix[9])
rotation = atan2(CONV_FP(matrix[1]) / scale[1],
CONV_FP(matrix[0]) / scale[0]) * 180 / M_PI;
- return rotation;
+ return -rotation;
}
void av_display_rotation_set(int32_t matrix[9], double angle)
{
- double radians = angle * M_PI / 180.0f;
+ double radians = -angle * M_PI / 180.0f;
double c = cos(radians);
double s = sin(radians);