summaryrefslogtreecommitdiff
path: root/fftools/ffplay.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2021-09-08 15:34:25 -0300
committerJames Almer <jamrial@gmail.com>2021-09-16 12:46:07 -0300
commit535a835e5176a5f2d5e03776030bacbc3e19d604 (patch)
treeaea1837b695e9f01c7b6999cc3169acd48897730 /fftools/ffplay.c
parenta8bd8d46f9d32582c5b89cdc57f9cb7169e94066 (diff)
downloadffmpeg-535a835e5176a5f2d5e03776030bacbc3e19d604.tar.gz
ffmpeg: use display matrix frame side data for autorotation
And give it priority over stream side data when present. Fixes part of ticket #6945. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'fftools/ffplay.c')
-rw-r--r--fftools/ffplay.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 46758b9f55..ccea0e4578 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -1925,7 +1925,8 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
} while (0)
if (autorotate) {
- double theta = get_rotation(is->video_st);
+ int32_t *displaymatrix = (int32_t *)av_stream_get_side_data(is->video_st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+ double theta = get_rotation(displaymatrix);
if (fabs(theta - 90) < 1.0) {
INSERT_FILT("transpose", "clock");