Commit 4df9d9ca authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b141c7b3'

* commit 'b141c7b3':
  h264: give numbers to nalus
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dd2b3303 b141c7b3
...@@ -102,19 +102,19 @@ ...@@ -102,19 +102,19 @@
/* NAL unit types */ /* NAL unit types */
enum { enum {
NAL_SLICE = 1, NAL_SLICE = 1,
NAL_DPA, NAL_DPA = 2,
NAL_DPB, NAL_DPB = 3,
NAL_DPC, NAL_DPC = 4,
NAL_IDR_SLICE, NAL_IDR_SLICE = 5,
NAL_SEI, NAL_SEI = 6,
NAL_SPS, NAL_SPS = 7,
NAL_PPS, NAL_PPS = 8,
NAL_AUD, NAL_AUD = 9,
NAL_END_SEQUENCE, NAL_END_SEQUENCE = 10,
NAL_END_STREAM, NAL_END_STREAM = 11,
NAL_FILLER_DATA, NAL_FILLER_DATA = 12,
NAL_SPS_EXT, NAL_SPS_EXT = 13,
NAL_AUXILIARY_SLICE = 19, NAL_AUXILIARY_SLICE = 19,
NAL_FF_IGNORE = 0xff0f001, NAL_FF_IGNORE = 0xff0f001,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment