summaryrefslogtreecommitdiff
path: root/libavcodec/cbs_mpeg2.h
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-05-22 03:04:34 +0200
committerMark Thompson <sw@jkqxz.net>2019-05-29 00:16:26 +0100
commitde5880383967f44927c599ab16fa0f4f96b38365 (patch)
treef48c651638fc7c47790507532e0895a047427414 /libavcodec/cbs_mpeg2.h
parent9c3f2a8894a66d6b5b9285caa25f91fbfca7b3bc (diff)
cbs_mpeg2: Fix storage type for frame_centre_*_offset
The frame_centre_horizontal/vertical_offset values contained in picture display extensions are actually signed values (i.e. it is possible to indicate that the display device should add black bars/pillars). The files sony-ct3.bs and tcela-6.bits (which are both used in fate tests for mpeg2_metadata) contain picture display extensions; the former even contains a negative frame_centre_vertical_offset. Fortunately, the old code did not damage the picture display extensions when one did a cycle of reading and writing. For the same reason the fate tests needn't be updated either. Furthermore these fields now use the trace output for matrices. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/cbs_mpeg2.h')
-rw-r--r--libavcodec/cbs_mpeg2.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cbs_mpeg2.h b/libavcodec/cbs_mpeg2.h
index 7565695acb..11f93b9df8 100644
--- a/libavcodec/cbs_mpeg2.h
+++ b/libavcodec/cbs_mpeg2.h
@@ -164,8 +164,8 @@ typedef struct MPEG2RawQuantMatrixExtension {
} MPEG2RawQuantMatrixExtension;
typedef struct MPEG2RawPictureDisplayExtension {
- uint16_t frame_centre_horizontal_offset[3];
- uint16_t frame_centre_vertical_offset[3];
+ int16_t frame_centre_horizontal_offset[3];
+ int16_t frame_centre_vertical_offset[3];
} MPEG2RawPictureDisplayExtension;
typedef struct MPEG2RawExtensionData {