diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 17:38:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 17:38:10 +0400 |
| commit | 09b4ae8331f8c073792583d1eddf96973f709c89 (patch) | |
| tree | 7148f59a17305268b418abbc632b6a4f21936691 /libavcodec/h264.h | |
| parent | 94ecbe23c52b699a8f2bda1cf71fb4efbf28679a (diff) | |
| parent | 61c6eef5456f2bc8b1dc49a0a759c975551cea29 (diff) | |
Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'
* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
h264: prevent decoding of slice NALs in extradata
doxy: Clarify what avpriv_set_pts_info does
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index bea6e22eca..2be4809a16 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -115,7 +115,8 @@ enum { NAL_END_STREAM, NAL_FILLER_DATA, NAL_SPS_EXT, - NAL_AUXILIARY_SLICE = 19 + NAL_AUXILIARY_SLICE = 19, + NAL_FF_IGNORE = 0xff0f001, }; /** |