• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 27744fe4
    Michael Niedermayer authored
    * qatar/master:
      mpeg12: fixed parsing in some mpeg2 streams
      Add SMPTE240M transfer characteristics flag.
      mpegts: Some additional HDMV types and reg descriptors for mpegts
      motionpixels: Clip YUV values after applying a gradient.
      jpeg: handle progressive in second field of interlaced.
      ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
      h263: more strictly forbid frame size changes with frame-mt.
      h264: additional protection against unsupported size/bitdepth changes.
      tta: prevents overflows for 32bit integers in header.
      configure: remove malloc_aligned.
      vp8: update frame size changes on thread context switches.
      snowdsp: explicitily state instruction size.
      wmall: fix reconstructing audio with uncoded channels
      WMAL cosmetics: fix indentation
      gitignore: add Win32 library suffixes
    
    Conflicts:
    	configure
    	libavcodec/h263dec.c
    	libavcodec/h264.c
    	libavcodec/ituh263dec.c
    	libavcodec/mjpegdec.c
    	libavcodec/wmalosslessdec.c
    	libavcodec/x86/snowdsp_mmx.c
    	libavformat/mpegts.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    27744fe4
h264_ps.c 24 KB