Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'

* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
  h264: create a new header for common h264 definitions

Merged-by: Clément Bœsch <u@pkh.me>

10 files changed, 53 insertions, 21 deletions

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
new file mode 100644
index 0000000000..72b133b1d7
--- /dev/null
+++ b/libavcodec/h264.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * H.264 common definitions
+ */
+
+#ifndef AVCODEC_H264_H
+#define AVCODEC_H264_H
+
+/* 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,
+};
+
+#endif /* AVCODEC_H264_H */
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index 052298b289..5d1157ecbb 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -19,6 +19,7 @@
 #include "bytestream.h"
 #include "get_bits.h"
 #include "golomb.h"
+#include "h264.h"
 #include "h264dec.h"
 #include "h264_parse.h"
 
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index e2ca60ff10..34bd0e13f5 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -38,6 +38,7 @@
 
 #include "get_bits.h"
 #include "golomb.h"
+#include "h264.h"
 #include "h264dec.h"
 #include "h264_sei.h"
 #include "h264data.h"
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 4246e8702e..e66f69a2aa 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -30,6 +30,7 @@
 #include "libavutil/avassert.h"
 #include "internal.h"
 #include "avcodec.h"
+#include "h264.h"
 #include "h264dec.h"
 #include "golomb.h"
 #include "mpegutils.h"
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index e70f2ee4eb..5c505a138a 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -35,6 +35,7 @@
 #include "cabac_functions.h"
 #include "error_resilience.h"
 #include "avcodec.h"
+#include "h264.h"
 #include "h264dec.h"
 #include "h264data.h"
 #include "h264chroma.h"
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 8e07e7eb10..511e78c6e3 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -39,6 +39,7 @@
 #include "cabac_functions.h"
 #include "error_resilience.h"
 #include "avcodec.h"
+#include "h264.h"
 #include "h264dec.h"
 #include "h2645_parse.h"
 #include "h264data.h"
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 009a86104a..c74b9fad6c 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
  */
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 665ec1d7fb..1b2ae0d997 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -41,7 +41,7 @@
 #include "libavutil/opt.h"
 
 #include "avcodec.h"
-#include "h264dec.h"
+#include "h264.h"
 #include "internal.h"
 
 #ifdef OMX_SKIP64BIT
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 99b76c0f13..d576edec06 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -25,7 +25,7 @@
 #include "libavutil/pixfmt.h"
 
 #include "avcodec.h"
-#include "h264dec.h"
+#include "h264.h"
 #include "h264_sei.h"
 #include "internal.h"
 #include "vaapi_encode.h"
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index f256f67295..80318b8903 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -48,7 +48,7 @@
 #include "libavutil/time_internal.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/dnxhddata.h"
-#include "libavcodec/h264dec.h"
+#include "libavcodec/h264.h"
 #include "libavcodec/internal.h"
 #include "audiointerleave.h"
 #include "avformat.h"