Fix conflicts

libavcodec/h264.c

@@ -880,14 +880,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
     int idr_cleared=0;
     int i, ret = 0;
 
-<<<<<<< HEAD
     h->nal_unit_type= 0;
 
-    h->max_contexts = h->nb_slice_ctx;
-||||||| merged common ancestors
-    h->max_contexts = h->nb_slice_ctx;
-=======
->>>>>>> 2e5bde956519ae19cedfa482e199518e495bcaf5
     if (!(avctx->flags2 & AV_CODEC_FLAG2_CHUNKS)) {
         h->current_slice = 0;
         if (!h->first_field)

libavcodec/h264.h

@@ -614,32 +614,12 @@ typedef struct H264Context {
      */
     int current_slice;
 
-<<<<<<< HEAD
-    /**
-     * Max number of threads / contexts.
-     * This is equal to AVCodecContext.thread_count unless
-     * multithreaded decoding is impossible, in which case it is
-     * reduced to 1.
-     */
-    int max_contexts;
-
     /**
      *  1 if the single thread fallback warning has already been
      *  displayed, 0 otherwise.
      */
     int single_decode_warning;
 
-||||||| merged common ancestors
-    /**
-     * Max number of threads / contexts.
-     * This is equal to AVCodecContext.thread_count unless
-     * multithreaded decoding is impossible, in which case it is
-     * reduced to 1.
-     */
-    int max_contexts;
-
-=======
->>>>>>> 2e5bde956519ae19cedfa482e199518e495bcaf5
     /** @} */
 
     /**

libavcodec/h264_slice.c

@@ -1055,12 +1055,12 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
                 av_log(h->avctx, AV_LOG_ERROR, "Too many fields\n");
                 return AVERROR_INVALIDDATA;
             }
-            if (h->max_contexts > 1) {
+            if (h->nb_slice_ctx > 1) {
                 if (!h->single_decode_warning) {
                     av_log(h->avctx, AV_LOG_WARNING, "Cannot decode multiple access units as slice threads\n");
                     h->single_decode_warning = 1;
                 }
-                h->max_contexts = 1;
+                h->nb_slice_ctx = 1;
                 return SLICE_SINGLETHREAD;
             }