diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-29 11:13:44 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-29 11:13:44 +0200 |
| commit | ecf65c30cf7545c72c0e27b32283fc9c55b03544 (patch) | |
| tree | edaed0920d675856ae7eb9fdf90a7ce5fc9d7d5c /libavcodec/h264dec.h | |
| parent | 15b26e88cb7c775e0e7a422ab6b088b5690f31ad (diff) | |
| parent | 251cbb44003caf179fb17afbb8a6c56643c2a646 (diff) | |
| download | ffmpeg-streaming-ecf65c30cf7545c72c0e27b32283fc9c55b03544.zip ffmpeg-streaming-ecf65c30cf7545c72c0e27b32283fc9c55b03544.tar.gz | |
Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
h264: create a new header for common h264 definitions
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264dec.h')
| -rw-r--r-- | libavcodec/h264dec.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 009a861..c74b9fa 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -111,24 +111,6 @@ #define QP_MAX_NUM (51 + 6*6) // The maximum supported qp -/* NAL unit types */ -enum { - NAL_SLICE = 1, - NAL_DPA = 2, - NAL_DPB = 3, - NAL_DPC = 4, - NAL_IDR_SLICE = 5, - NAL_SEI = 6, - NAL_SPS = 7, - NAL_PPS = 8, - NAL_AUD = 9, - NAL_END_SEQUENCE = 10, - NAL_END_STREAM = 11, - NAL_FILLER_DATA = 12, - NAL_SPS_EXT = 13, - NAL_AUXILIARY_SLICE = 19, -}; - /** * Sequence parameter set */ |
