• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c73fcc8d
    Michael Niedermayer authored
    * qatar/master:
      yuv4mpeg: reject unsupported codecs
      nutenc: K&R formatting cosmetics
      assdec: fix qsort() callback signature
      configure: detect sparc64 automatically
      vp8: fix memset() crossing array boundary
      h264: fix invalid pointer arithmetic
      amrwbdec: fix invalid pointer arithmetic
    
    Conflicts:
    	libavformat/nutenc.c
    	libavformat/yuv4mpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c73fcc8d
nutenc.c 32.9 KB