• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 86602d1c
    Michael Niedermayer authored
    * qatar/master:
      vp6: Reset the internal state when aborting key frames header parsing
      vp56: Release old pictures after a resolution changes
      vp6: Check for huffman tree build errors
      vp56: Check for missing reference frame data
      cinepak: Fix invalid read access on extra data
      vmd: fix segfaults on corruped streams
      cook: Fix js_vlc_bits value validation for joint stereo
      segafilm: Check for memory allocation failures in segafilm demuxer.
      segafilm: Fix potential division by 0 on corrupted streams in the demuxer
      Fixed segfault on corrupted sega streams in the demuxer.
      Fixed deference of NULL pointer in motionpixels decoder.
      libx264: support 9- and 10-bit output.
      h264: correct implicit_weight for field-interlaced pictures.
      mpegvideo: set correct offset for edge emulation buffer.
      mpegvideo: fix position of bottom edge.
    
    Conflicts:
    	libavcodec/motionpixels.c
    	libavcodec/mpegvideo.c
    	libavcodec/version.h
    	libavcodec/vmdav.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    86602d1c
avcodec.h 143 KB