aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-29 03:13:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-03-29 03:13:23 +0200
commit4bc7996dcbcd3d62d177491a1e6e1f80d7178b13 (patch)
tree0bd6548d20a98c182e96b25c917751bcab92d017
parentf3b8cd748168efc37ba44b292bcbfd9500bbd853 (diff)
parenta219add4e8e2d3192d99d6c6efe97ec7c429c5ad (diff)
downloadffmpeg-4bc7996dcbcd3d62d177491a1e6e1f80d7178b13.tar.gz
Merge commit 'a219add4e8e2d3192d99d6c6efe97ec7c429c5ad' into release/2.4
* commit 'a219add4e8e2d3192d99d6c6efe97ec7c429c5ad': hevc: make the crop sizes unsigned Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 0369d8fb53..92b0423751 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -298,10 +298,10 @@ typedef struct RefPicListTab {
} RefPicListTab;
typedef struct HEVCWindow {
- int left_offset;
- int right_offset;
- int top_offset;
- int bottom_offset;
+ unsigned int left_offset;
+ unsigned int right_offset;
+ unsigned int top_offset;
+ unsigned int bottom_offset;
} HEVCWindow;
typedef struct VUI {