diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-05-11 08:19:17 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-05-11 15:23:00 +0000 |
| commit | 5e17a2046b9bb0087c936594f4a9fd18a556fa24 (patch) | |
| tree | 9cf2a4ad343495e1a6aec7ed234a12ed7066186d /common | |
| parent | af6ce4991f9502bc40ed6f7eb5f5a506c602e139 (diff) | |
| parent | 8dc7b42e6593f5ce4fff187ab4e79b9f1ca318df (diff) | |
| download | libhevc-5e17a2046b9bb0087c936594f4a9fd18a556fa24.tar.gz | |
resolve merge conflicts of 8dc7b42 to mnc-dr-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 34896431
Change-Id: I670a2d2025f52b0197651bd4bb2acbc4887e0447
Diffstat (limited to 'common')
| -rw-r--r-- | common/ihevc_defs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/ihevc_defs.h b/common/ihevc_defs.h index a2b7eda..946687f 100644 --- a/common/ihevc_defs.h +++ b/common/ihevc_defs.h @@ -464,7 +464,6 @@ typedef enum { */ #define INTRA_PRED_CHROMA_IDX_NONE 7 - #define MAX_NUM_CLOCK_TS 3 #define MAX_USERDATA_PAYLOAD 256 |