• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b27c7d70
    Michael Niedermayer authored
    * qatar/master:
      mss1: fix decoding masked regions in interframes
      mxfdec: fix off by one error.
      mxfdec: only parse next partition pack if parsing forward
      mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
      mxfdec: fix frame height vs field height confusion
      mxfdec: Add intra_only flag to MXFTrack
      mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
      mxfdec: truncate packets that extend past the next edit unit
      mxfdec: set pixel format for cdci picture formats
      mxfdec: detect uncomp pictures using essence container ul
      mxfdec: set track edit rate num/den in expected order
      x86/cpu: implement get/set_eflags using intrinsics
      x86/cpu: implement support for cpuid through intrinsics
      x86/cpu: implement support for xgetbv through intrinsics
      lavu: use intrinsics for emms on systems lacking inline asm support
      mem: Don't abort on av_malloc(0) in debug mode
    
    Conflicts:
    	configure
    	libavformat/mxf.h
    	libavformat/mxfdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b27c7d70
mxfdec.c 85.4 KB