Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:53:31 +0000 (12:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:53:31 +0000 (12:53 +0100)
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
  display: fix order of operands

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c
libavcodec/hevc.c

@@@ -874,16 -832,14 +874,16 @@@ static void decode_postinit(H264Contex
          AVFrameSideData *rotation = av_frame_new_side_data(&cur->f,
                                                             AV_FRAME_DATA_DISPLAYMATRIX,
                                                             sizeof(int32_t) * 9);
 -        if (!rotation)
 -            return;
 -
 -        av_display_rotation_set((int32_t *)rotation->data, angle);
 -        av_display_matrix_flip((int32_t *)rotation->data,
 -                               h->sei_hflip, h->sei_vflip);
 +        if (rotation) {
 +            av_display_rotation_set((int32_t *)rotation->data, angle);
 +            av_display_matrix_flip((int32_t *)rotation->data,
-                                    h->sei_vflip, h->sei_hflip);
++                                   h->sei_hflip, h->sei_vflip);
 +        }
      }
  
 +    cur->mmco_reset = h->mmco_reset;
 +    h->mmco_reset = 0;
 +
      // FIXME do something with unavailable reference frames
  
      /* Sort B-frames into display order */
Simple merge