diff options
| author | James Almer <jamrial@gmail.com> | 2021-09-08 15:34:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-09-16 12:46:07 -0300 |
| commit | 535a835e5176a5f2d5e03776030bacbc3e19d604 (patch) | |
| tree | aea1837b695e9f01c7b6999cc3169acd48897730 /fftools/cmdutils.c | |
| parent | a8bd8d46f9d32582c5b89cdc57f9cb7169e94066 (diff) | |
| download | ffmpeg-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/cmdutils.c')
| -rw-r--r-- | fftools/cmdutils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 7e9c4299fa..ed3dcd31f4 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2201,10 +2201,8 @@ void *grow_array(void *array, int elem_size, int *size, int new_size) return array; } -double get_rotation(AVStream *st) +double get_rotation(int32_t *displaymatrix) { - uint8_t* displaymatrix = av_stream_get_side_data(st, - AV_PKT_DATA_DISPLAYMATRIX, NULL); double theta = 0; if (displaymatrix) theta = -round(av_display_rotation_get((int32_t*) displaymatrix)); |