Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-08 20:08:12 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-02-08 20:09:39 +0400
commit4df9d9ca4f5a4e6397c34d7d6e8193549f99bd7c (patch)
tree1420b876e422a24c4e3dc67ca5ba242f1407d149
parentdd2b3303477764b4a77cf3f2efb5251331d837a0 (diff)
parentb141c7b37eb52aca41ac83738f159b63b9c09d5c (diff)
Merge commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c'
* commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c': h264: give numbers to nalus Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 6606d0b973..e749139ef1 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -102,19 +102,19 @@
/* NAL unit types */
enum {
- NAL_SLICE = 1,
- NAL_DPA,
- NAL_DPB,
- NAL_DPC,
- NAL_IDR_SLICE,
- NAL_SEI,
- NAL_SPS,
- NAL_PPS,
- NAL_AUD,
- NAL_END_SEQUENCE,
- NAL_END_STREAM,
- NAL_FILLER_DATA,
- NAL_SPS_EXT,
+ 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,
NAL_FF_IGNORE = 0xff0f001,
};