Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'

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

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

diff --cc libavcodec/h264.h
index 0000000000000000000000000000000000000000,650371f803a296ef98d7e0ee76bc6a20d7c3715d..72b133b1d7c4c6d60a64767e2d326089f629e96a
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@@ -1,0 -1,45 +1,45 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * 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 --cc libavcodec/h264_parse.c
Simple merge

diff --cc libavcodec/h264_parser.c
Simple merge

diff --cc libavcodec/h264_refs.c
index 4246e8702e7fc5bdb0f109cd557c13744156e29d,4172fbdaa3d3d7f64d202f9f0c6b83838e443889..e66f69a2aad8fae432670454284374cc448b1951
--- 1/libavcodec/h264_refs.c
--- 2/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@@ -27,9 -27,9 +27,10 @@@
  
  #include <inttypes.h>
  
 +#include "libavutil/avassert.h"
  #include "internal.h"
  #include "avcodec.h"
+ #include "h264.h"
  #include "h264dec.h"
  #include "golomb.h"
  #include "mpegutils.h"

diff --cc libavcodec/h264_slice.c
Simple merge

diff --cc libavcodec/h264dec.c
Simple merge

diff --cc libavcodec/h264dec.h
index 009a86104a04cd15201ce7e52fcd26cae8853c1e,e79257ea36579cda14e6d0c07c388c20a7b1c6af..c74b9fad6cd3aeae93dc306ab07abac11c258d5e
--- 1/libavcodec/h264dec.h
--- 2/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@@ -109,26 -106,8 +109,8 @@@
  #define IS_REF0(a)         ((a) & MB_TYPE_REF0)
  #define IS_8x8DCT(a)       ((a) & MB_TYPE_8x8DCT)
  
 -#define QP_MAX_NUM (51 + 2 * 6)           // The maximum supported qp
 +#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 --cc libavcodec/omx.c
Simple merge

diff --cc libavcodec/vaapi_encode_h264.c
Simple merge

diff --cc libavformat/mxfenc.c
index f256f672956999924f08e08ce2eda86916fb27b9,1431fc65e871e2efe7b4135994734584e79e6ec7..80318b8903cb0a1fa89a61a47891bcf6fa664a4a
--- 1/libavformat/mxfenc.c
--- 2/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@@ -40,25 -34,18 +40,25 @@@
  #include <math.h>
  #include <time.h>
  
 +#include "libavutil/opt.h"
  #include "libavutil/random_seed.h"
 +#include "libavutil/timecode.h"
 +#include "libavutil/avassert.h"
 +#include "libavutil/pixdesc.h"
  #include "libavutil/time_internal.h"
  #include "libavcodec/bytestream.h"
- #include "libavcodec/h264dec.h"
 +#include "libavcodec/dnxhddata.h"
++#include "libavcodec/h264.h"
 +#include "libavcodec/internal.h"
  #include "audiointerleave.h"
  #include "avformat.h"
 +#include "avio_internal.h"
  #include "internal.h"
  #include "mxf.h"
 -
 -static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
 -static const int PAL_samples_per_frame[]  = { 1920, 0 };
 +#include "config.h"
  
  extern AVOutputFormat ff_mxf_d10_muxer;
 +extern AVOutputFormat ff_mxf_opatom_muxer;
  
  #define EDIT_UNITS_PER_BODY 250
  #define KAG_SIZE 512