• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3be1a4ba
    Michael Niedermayer authored
    * qatar/master:
      lavc: always align height by 32 pixel
      raw: add 10bit YUV definitions
      nut: support 10bit YUV
      mpegvideo_enc: separate declarations and statements
      oma: make header compile standalone
      vp3: Reorder some functions to fix VP3 build with Theora disabled.
      build: fix standalone compilation of ADX encoder
      build: fix standalone compilation of ADPCM decoders
      build: fix standalone compilation of mpc7/mpc8 decoders
      4xm: Use bytestream2 functions to prevent overreads
      bytestream: add a new set of bytestream functions with overread checking
      mpegts: Suppress invalid timebase warnings on DMB streams.
      mpegts: Fix typo in handling sections in the PMT.
      vc1dec: Use the right pointer type for the tmp pointer
    
    Conflicts:
    	libavcodec/4xm.c
    	libavcodec/utils.c
    	libavcodec/vc1dec.c
    	libavcodec/vp3.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3be1a4ba
nut.c 6.33 KB