diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 16:58:02 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 16:58:02 +0400 |
commit | 99b12357f47efd7da070e29d888e9e7646824667 (patch) | |
tree | 65d7d46c6a976a0d3dabb31f34c2efdfb064151b /libavcodec/h264.h | |
parent | 60b46a00c62db3e366322f99d261480cd213bfa5 (diff) | |
parent | 3a0576702825423abecb32627c530dbc4c0f73bc (diff) |
Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'
* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
h264: store current_sps_id inside the current sps
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
The current_sps_id is not removed as it used in security related code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e749139ef1..eccce5a69b 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -163,6 +163,7 @@ typedef enum { * Sequence parameter set */ typedef struct SPS { + unsigned int sps_id; int profile_idc; int level_idc; int chroma_format_idc; |