• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1eb7f39c
    Michael Niedermayer authored
    * qatar/master:
      h264: error out on invalid bitdepth.
      aacsbr: use a swap index for the Y matrix rather than copy buffers.
      huffyuv: do not abort on unknown pix_fmt; instead, return an error.
      lcl: return negative error codes on decode_init() errors.
      rtpenc: Use MB info side data for splitting H263 packets for RFC 2190
      h263enc: Add an option for outputting info about MBs as side data
      avpacket: Add a function for shrinking already allocated side data
      nellymoserdec: Saner and faster IMDCT windowing
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/avpacket.c
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1eb7f39c
lcldec.c 23 KB