diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:14:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:14:31 +0100 |
| commit | dfea1acb21f3a3945d04537855ab6412c2b4e323 (patch) | |
| tree | 5eb54b082827af6f57b2ea5fd62570981f9e311a /libavutil/display.c | |
| parent | 001b28b0211b6501f9ffa1e6187b8a111901464f (diff) | |
| parent | e4fe535d12f4f30df2dd672e30304af112a5a827 (diff) | |
Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
mov: Write the display matrix in order
Conflicts:
libavformat/mov.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/display.c')
| -rw-r--r-- | libavutil/display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/display.c b/libavutil/display.c index 53e8aa255f..a0076e067b 100644 --- a/libavutil/display.c +++ b/libavutil/display.c @@ -44,12 +44,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); |