mirror of
https://github.com/ittiam-systems/libhevc.git
synced 2026-10-18 06:46:01 +07:00
resolve merge conflicts of 8dc7b42 to mnc-dr-dev am: 5e17a2046b am: 58bfcb1dc5
am: bdf7425935
Change-Id: Ib187daca5301800209fb4ac2d0754799f33a815e
This commit is contained in:
commit
c7c53a53c2
1 changed files with 0 additions and 1 deletions
|
|
@ -464,7 +464,6 @@ typedef enum {
|
|||
*/
|
||||
#define INTRA_PRED_CHROMA_IDX_NONE 7
|
||||
|
||||
|
||||
#define MAX_NUM_CLOCK_TS 3
|
||||
#define MAX_USERDATA_PAYLOAD 256
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue